aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index a433632b43..973f8efd69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,11 @@ gem 'mocha', '~> 0.14', require: false
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'
+
+# 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.