From 1188fb1eccbbce377be54c44447c9e453b61b912 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 10 Oct 2012 14:47:20 -0700 Subject: Upgrade to a jquery-rails that doesn't expect config.action_view.javascript_expansions to exist --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3b77524077..fbb9a7eb90 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'mocha', '>= 0.11.2', :require => false gem 'rack-test', github: 'brynary/rack-test' gem 'rack-cache', "~> 1.2" gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-rails' +gem 'jquery-rails', '~> 2.1.4', github: 'rails/jquery-rails' gem 'turbolinks' gem 'coffee-rails', github: 'rails/coffee-rails' -- cgit v1.2.3 From 7891cbf4c0dd43c46f735b9321e0c455558499f3 Mon Sep 17 00:00:00 2001 From: Lee Reilly Date: Sat, 13 Oct 2012 11:22:51 -0700 Subject: Replace double quotes with single quotes --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index fbb9a7eb90..d981f4c0df 100644 --- a/Gemfile +++ b/Gemfile @@ -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' -- cgit v1.2.3 From 7b290ad13c294005db062e746f8b79c8a192e4fa Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 14 Oct 2012 10:03:17 -0700 Subject: The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d981f4c0df..9afbac6e02 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ 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 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < "2.0" && RUBY_PATCHLEVEL < 286 end end -- cgit v1.2.3 From 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 15 Oct 2012 06:32:16 -0700 Subject: ruby-prof isn't compatible with ruby trunk after 36925 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9afbac6e02..0fff8a8967 100644 --- a/Gemfile +++ b/Gemfile @@ -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" && RUBY_PATCHLEVEL < 286 + 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 -- cgit v1.2.3 From b8c7e31a573315b5b718ccf45f3197d6250ac4a2 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 15 Oct 2012 18:22:12 -0500 Subject: Switch to new sprockets-rails plugin --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0fff8a8967..6a0680fe8f 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_fi # it being automatically loaded by sprockets gem 'uglifier', require: false -gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' +gem 'sprockets-rails', github: 'josh/sprockets-rails', branch: 'master' group :doc do # The current sdoc cannot generate GitHub links due -- cgit v1.2.3 From ea14e7624ef8e80ffa7e352bcfd0f75fd187e1d3 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Tue, 16 Oct 2012 16:42:14 +0530 Subject: redcarpet gem will not work with JRuby! --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9afbac6e02..0cb4cad48d 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ group :doc do # for some weeks unapplied. As a temporary solution # this is our own fork with the fix. gem 'sdoc', github: 'fxn/sdoc' - gem 'redcarpet', '~> 2.1.1' + gem 'redcarpet', '~> 2.1.1', :platforms => :ruby gem 'w3c_validators' end -- cgit v1.2.3 From d88b65f986147d932b41370c4d4c56b6b8a09bd0 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 17 Oct 2012 21:51:37 -0500 Subject: Change back to official sprockets-rails --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9ad535b334..6e0f43c526 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_fi # it being automatically loaded by sprockets gem 'uglifier', require: false -gem 'sprockets-rails', github: 'josh/sprockets-rails', branch: 'master' +gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' group :doc do # The current sdoc cannot generate GitHub links due -- cgit v1.2.3