Merge branch 'master' of github.com:rails/rails
Showing
... | ... | @@ -7,7 +7,7 @@ gemspec |
# ensure correct loading order | ||
gem 'mocha', '~> 0.14', require: false | ||
gem 'rack', github: 'rack/rack' | ||
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' | ||
... | ... |
此差异已折叠。
想要评论请 注册 或 登录