From 2e0fe5928f0d08f85b4796c85bd0b39f6be09079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 14 Nov 2017 14:11:29 -0500 Subject: Use released arel --- Gemfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3f8cd57853..f5a0ceeaad 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec -gem "arel", github: "rails/arel" - # We need a newish Rake since Active Job sets its test tasks' descriptions. gem "rake", ">= 11.1" -- cgit v1.2.3 From 79c3d5a67d095379f72746b7b9f485861cdf9d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 14 Nov 2017 14:42:12 -0500 Subject: Use released sass-rails --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f5a0ceeaad..9ff34dc26c 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "capybara", "~> 2.15" gem "rack-cache", "~> 1.2" gem "coffee-rails" -gem "sass-rails", github: "rails/sass-rails", branch: "5-0-stable" +gem "sass-rails" gem "turbolinks", "~> 5" # require: false so bcrypt is loaded only when has_secure_password is used. -- cgit v1.2.3 From 3bbc7f8f635b0d89e546c90d1b9db0683beece75 Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Thu, 16 Nov 2017 11:31:26 -0700 Subject: Move back to resque-scheduler mainline now that https://github.com/resque/resque-scheduler/pull/620 is merged --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9ff34dc26c..b20e477764 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ gem "bootsnap", ">= 1.1.0", require: false # Active Job. group :job do gem "resque", require: false - gem "resque-scheduler", github: "jeremy/resque-scheduler", branch: "redis-rb-4.0", require: false + gem "resque-scheduler", github: "resque/resque-scheduler", require: false gem "sidekiq", require: false gem "sucker_punch", require: false gem "delayed_job", require: false -- cgit v1.2.3