From 24b8e76a2276c8e87041b39a4a21ad8d871179be Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Sat, 21 Jun 2014 00:15:08 -0600 Subject: [PATCH] allow ruby 2.1.2 and bundler 1.6.3 Change-Id: I1ee8bf656f1ec78c1a2c754dc1fec857a2ab79bf Reviewed-on: https://gerrit.instructure.com/36710 Reviewed-by: Rob Orton Tested-by: Jenkins Product-Review: Cody Cutrer QA-Review: Cody Cutrer --- Gemfile.d/_before.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.d/_before.rb b/Gemfile.d/_before.rb index 51b3d054130..5a9ba3f1a76 100644 --- a/Gemfile.d/_before.rb +++ b/Gemfile.d/_before.rb @@ -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)