From b98efa2652cd243ceb82aadbcbd895fc87d07bb7 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 11 Mar 2013 11:10:33 -0700 Subject: debugger does not work on trunk --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d8b3390f87..beb89247c3 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ instance_eval File.read local_gemfile if File.exists? local_gemfile platforms :mri do group :test do gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0' - gem 'debugger' if !ENV['TRAVIS'] + gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < '2.1' end end -- cgit v1.2.3 From de1354f0ba069e704f3ea465de073e8f1ca3df2b Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 11 Mar 2013 15:48:30 -0300 Subject: Use platforms instead of conditionals in Gemfile --- Gemfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index beb89247c3..01ee898780 100644 --- a/Gemfile +++ b/Gemfile @@ -27,10 +27,13 @@ gem 'dalli', '>= 2.2.1' local_gemfile = File.dirname(__FILE__) + "/.Gemfile" instance_eval File.read local_gemfile if File.exists? local_gemfile -platforms :mri do - group :test do - gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0' - gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < '2.1' +group :test do + platforms :mri_19 do + gem 'ruby-prof', '~> 0.11.2' + end + + platforms :mri_19, :mri_20 do + gem 'debugger' if !ENV['TRAVIS'] end end -- cgit v1.2.3 From 4076288a839285df934732b5ae191256a0a7e236 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 11 Mar 2013 15:49:05 -0300 Subject: Move benchmark-ips to test group --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 01ee898780..bdf486e9bb 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,8 @@ group :test do platforms :mri_19, :mri_20 do gem 'debugger' if !ENV['TRAVIS'] end + + gem 'benchmark-ips' end platforms :ruby do @@ -79,5 +81,3 @@ end # A gem necessary for ActiveRecord tests with IBM DB gem 'ibm_db' if ENV['IBM_DB'] - -gem 'benchmark-ips' -- cgit v1.2.3 From 5da8c1627c4495f1bf6a4b2b1c223451726204a7 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 11 Mar 2013 15:50:31 -0300 Subject: There's no need to install test group in travis --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index bdf486e9bb..a367397c89 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ group :test do end platforms :mri_19, :mri_20 do - gem 'debugger' if !ENV['TRAVIS'] + gem 'debugger' end gem 'benchmark-ips' -- cgit v1.2.3 From 8d3e5c8c5200880a66abef3fd2f45104e65732e9 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 14 Mar 2013 22:42:12 -0700 Subject: hide more data in the schema cache --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a367397c89..fed5683e51 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0.beta1' +gem 'arel', :path => '/Users/aaron/git/arel' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From ab379b50256ad27ad063c525eaf77312b0136c05 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 14 Mar 2013 22:49:22 -0700 Subject: oops! --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index fed5683e51..a367397c89 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,6 @@ gem 'bcrypt-ruby', '~> 3.0.0' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0.beta1' -gem 'arel', :path => '/Users/aaron/git/arel' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 6f3f0f86332004fcee5c2f05d52bbff08c22f980 Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Sat, 23 Mar 2013 23:52:37 -0500 Subject: Use jquery-rails from github (fix Gem::Version error) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a367397c89..45deca8315 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gemspec gem 'mocha', '~> 0.13.0', require: false gem 'rack-cache', '~> 1.2' gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-rails', '~> 2.2.0' +gem 'jquery-rails', github: 'rails/jquery-rails' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0.beta1' -- cgit v1.2.3 From 22caf3983f966a9321c88d41a139dd53a59eeccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 27 Mar 2013 10:49:15 -0300 Subject: Use thor master since 0.18.0 has a regression See https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a for the discussion and https://github.com/wycats/thor/pull/316 for the fix --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 45deca8315..9abc8a5d66 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' gem 'jquery-rails', github: 'rails/jquery-rails' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0.beta1' +gem 'thor', github: 'wycats/thor' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3