Merge branch 'master' into rm-uuid-fixtures
Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md
Showing
... | ... | @@ -11,6 +11,7 @@ gem 'rack-cache', '~> 1.2' |
gem 'jquery-rails', '~> 3.1.0' | ||
gem 'turbolinks' | ||
gem 'coffee-rails', '~> 4.0.0' | ||
gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: '2-1-stable' | ||
# require: false so bcrypt is loaded only when has_secure_password is used. | ||
# This is to avoid ActiveModel (and by extension the entire framework) | ||
... | ... |
... | ... | @@ -27,5 +27,5 @@ |
s.add_dependency 'railties', version | ||
s.add_dependency 'bundler', '>= 1.3.0', '< 2.0' | ||
s.add_dependency 'sprockets-rails', '~> 2.0.0' | ||
s.add_dependency 'sprockets-rails', '~> 2.1' | ||
end |
想要评论请 注册 或 登录