aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index b86684bf64..973f8efd69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,15 +7,13 @@ gemspec
# ensure correct loading order
gem 'mocha', '~> 0.14', require: false
-gem 'rack', github: 'rack/rack', branch: 'master'
gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 3.1.0'
-gem 'turbolinks', github: 'rails/turbolinks', branch: 'master'
gem 'coffee-rails', '~> 4.0.0'
-gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer'
-gem 'rails-deprecated_sanitizer', github: 'rails/rails-deprecated_sanitizer'
-#temporary gem until a new version of loofah is released
-gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub'
+gem 'rails-html-sanitizer'
+
+# TODO: remove this before the 4.2.0.beta1 release
+gem 'turbolinks', github: 'rails/turbolinks', branch: 'master'
gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
# require: false so bcrypt is loaded only when has_secure_password is used.
@@ -38,7 +36,6 @@ end
gem 'dalli', '>= 2.2.1'
# ActiveJob
-gem 'globalid', github: 'rails/globalid'
gem 'resque', require: false
gem 'resque-scheduler', require: false
gem 'sidekiq', require: false