ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow ruby 2.1.2 and bundler 1.6.3 

Change-Id: I1ee8bf656f1ec78c1a2c754dc1fec857a2ab79bf
Reviewed-on: https://gerrit.instructure.com/36710
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-06-21 00:15:08 -06:00
parent e68c2484ee
commit 24b8e76a22
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.d/_before.rb
View File

@ -20,15 +20,15 @@
if RUBY_VERSION == "2.0.0"
warn "Ruby 2.0 support is untested"
ruby '2.0.0', :engine => 'ruby', :engine_version => '2.0.0'
elsif RUBY_VERSION == "2.1.0"
elsif RUBY_VERSION >= "2.1" && RUBY_VERSION < "2.2"
warn "Ruby 2.1 support is untested"
ruby '2.1.0', :engine => 'ruby', :engine_version => '2.1.0'
ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
else
ruby '1.9.3', :engine => 'ruby', :engine_version => '1.9.3'
end
# # enforce the version of bundler itself, to avoid any surprises
required_bundler_version = '1.5.1'..'1.6.2'
required_bundler_version = '1.5.1'..'1.6.3'
gem 'bundler', [">=#{required_bundler_version.first}", "<=#{required_bundler_version.last}"]
unless required_bundler_version.include?(Bundler::VERSION)