aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-20 17:01:27 -0800
committerJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-20 17:01:27 -0800
commitc73001f4b7b5aae12a64be0c827c14739c0ba124 (patch)
tree2fff88211b4b88105ac0a78f549d5ca4d46246e1 /Gemfile
parent686b3466bab78ca69eaab98d76cc489d84d5eb62 (diff)
parent1d24e47140356f136471d15e3ce3fa427f4430c2 (diff)
downloadrails-c73001f4b7b5aae12a64be0c827c14739c0ba124.tar.gz
rails-c73001f4b7b5aae12a64be0c827c14739c0ba124.tar.bz2
rails-c73001f4b7b5aae12a64be0c827c14739c0ba124.zip
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 3f8cd57853..b20e477764 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"
@@ -19,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.
@@ -57,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