Skip to content

Commit

Permalink
Merge pull request hotsh#826 from carols10cents/default-to-ruby-2.1
Browse files Browse the repository at this point in the history
Use ruby 2.1.3 but allow travis to change for testing
  • Loading branch information
wilkie committed Jan 16, 2015
2 parents 56afdf4 + 3d90b42 commit 4058b07
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.1.3
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
source 'http://rubygems.org'

ruby ENV['TRAVIS_RUBY_VERSION'] || '2.1.3'

gem 'rails', '3.2.20'

# Gems used only for assets and not required

0 comments on commit 4058b07

Please sign in to comment.