diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
| commit | c800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch) | |
| tree | 0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /Gemfile | |
| parent | 7dba1599d9092a8362956a3fab23b2c60eedea63 (diff) | |
| parent | 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff) | |
| download | rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2 rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip | |
Merge branch 'master' into asset-path-helper
Conflicts:
railties/test/application/configuration_test.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -6,7 +6,7 @@ gem 'arel', github: 'rails/arel', branch: 'master' gem 'mocha', '>= 0.11.2', :require => false gem 'rack-test', github: 'brynary/rack-test' -gem 'rack-cache', "~> 1.2" +gem 'rack-cache', '~> 1.2' gem 'bcrypt-ruby', '~> 3.0.0' gem 'jquery-rails', '~> 2.1.4', github: 'rails/jquery-rails' gem 'turbolinks' @@ -41,8 +41,8 @@ instance_eval File.read local_gemfile if File.exists? local_gemfile platforms :mri do group :test do - gem 'ruby-prof', '~> 0.11.2' - gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < "2.0" + gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0' + gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < '2.0' && RUBY_PATCHLEVEL < 286 end end |