From aeb917d475dfccb8b5f3b5a57f62df5358ad3ef0 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 13 Nov 2014 15:31:54 -0800 Subject: exec_prepared is GVL friendly, so lets use it. also increase the version of pg required so that people will get the GVL friendly version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 931c8e85bc..fa17d217c9 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ platforms :ruby do gem 'sqlite3', '~> 1.3.6' group :db do - gem 'pg', '>= 0.11.0' + gem 'pg', '>= 0.15.0' gem 'mysql', '>= 2.9.0' gem 'mysql2', '>= 0.3.13' end -- cgit v1.2.3 From 7da5d8a5dc0116dabc395cb25482adf3d733d597 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Mon, 17 Nov 2014 06:39:32 -0800 Subject: Add StackProf to the test group for 2.1 Makes life easier for people profiling on master. --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index fa17d217c9..e7b7913970 100644 --- a/Gemfile +++ b/Gemfile @@ -64,6 +64,10 @@ group :test do gem 'ruby-prof', '~> 0.11.2' end + platforms :mri_21 do + gem 'stackprof' + end + # platforms :mri_19, :mri_20 do # gem 'debugger' # end -- cgit v1.2.3 From 5b7b98d5904e9f01f13b783f1a692a1c11168b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 17 Nov 2014 16:37:17 -0200 Subject: document_root_element need to be public --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e7b7913970..0705a21046 100644 --- a/Gemfile +++ b/Gemfile @@ -15,6 +15,7 @@ gem 'jquery-rails', '~> 4.0.0.beta2' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' gem 'arel', github: 'rails/arel' +gem 'rails-dom-testing', path: '~/src/rails/rails-dom-testing' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) -- cgit v1.2.3 From 27a181f7518616b5b508e17271145e330d948cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 17 Nov 2014 16:38:30 -0200 Subject: Use GitHub, not my local fork :sweat_smile: --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0705a21046..60b668401d 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'jquery-rails', '~> 4.0.0.beta2' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' gem 'arel', github: 'rails/arel' -gem 'rails-dom-testing', path: '~/src/rails/rails-dom-testing' +gem 'rails-dom-testing', github: 'rails/rails-dom-testing' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) -- cgit v1.2.3 From e3f7817cec95ac395c9e1491178a1fad0a73af63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 25 Nov 2014 19:42:17 -0200 Subject: Use released rails-dom-testing --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 60b668401d..e7b7913970 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ gem 'jquery-rails', '~> 4.0.0.beta2' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' gem 'arel', github: 'rails/arel' -gem 'rails-dom-testing', github: 'rails/rails-dom-testing' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) -- cgit v1.2.3 From 25c85cb6f6d8715da3f7fae08b165d01e6b34348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 25 Nov 2014 19:58:08 -0200 Subject: Use released arel --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e7b7913970..9f27acca6f 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ gem 'rack-cache', '~> 1.2' gem 'jquery-rails', '~> 4.0.0.beta2' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' -gem 'arel', github: 'rails/arel' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) -- cgit v1.2.3 From 75eacb00e0a5b23dca4f067dacafecddcb41b04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 25 Nov 2014 22:34:10 -0200 Subject: Use jquery-rails 4.0.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9f27acca6f..99e2cb9f58 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rake', '>= 10.3' gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'jquery-rails', '~> 4.0.0.beta2' +gem 'jquery-rails', '~> 4.0' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' -- cgit v1.2.3 From 2a4e14db981e38611667d407a975600ee720ada7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 26 Nov 2014 16:17:51 -0200 Subject: Test against rack master --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 99e2cb9f58..f1650ce7d3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,8 @@ source 'https://rubygems.org' gemspec +gem 'rack', github: 'rack/rack' + # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' -- cgit v1.2.3 From 31815d7167404557524712c665dda83505c094be Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 27 Nov 2014 16:53:27 -0200 Subject: Revert "Test against rack master" This reverts commit 2a4e14db981e38611667d407a975600ee720ada7. --- Gemfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f1650ce7d3..99e2cb9f58 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,6 @@ source 'https://rubygems.org' gemspec -gem 'rack', github: 'rack/rack' - # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' -- cgit v1.2.3 From 457fc61cec2b3ef2224ef673ae3e72d7d35c88ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 28 Nov 2014 17:10:32 -0200 Subject: Use jquery-rails master to resolve dependencies delayed_job_active_record doesn't allow Rails 5 yet --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 99e2cb9f58..e2cbce24c8 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rake', '>= 10.3' gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'jquery-rails', '~> 4.0' +gem 'jquery-rails', github: 'rails/jquery-rails' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' @@ -47,7 +47,7 @@ group :job do gem 'backburner', require: false gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false gem 'qu-redis', require: false - gem 'delayed_job_active_record', require: false + # gem 'delayed_job_active_record', require: false gem 'sequel', require: false end -- cgit v1.2.3 From b5242b6f95bc6a9481f438dce3fbed89e0f1edb0 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sat, 29 Nov 2014 16:11:57 -0700 Subject: Use arel master --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e2cbce24c8..a021f77417 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem 'rack-cache', '~> 1.2' gem 'jquery-rails', github: 'rails/jquery-rails' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' +gem 'arel', github: 'rails/arel' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) -- cgit v1.2.3