AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3-2-stable' into 3-2-github

Browse Source
This commit is contained in:
Charlie Somerville
2014-09-15 14:04:33 +10:00
parent 9cbc2c3550 11fd052aa8
commit 7684d715ef
26 changed files with 258 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -21,8 +21,11 @@ end
# it being automatically loaded by sprockets
gem 'uglifier', '>= 1.0.3', :require => false
# execjs >= 2.1.0 doesn't work with Ruby 1.8
gem 'execjs', '< 2.1.0'
gem 'rake', '>= 0.8.7'
gem 'mocha', '>= 0.13.0', :require => false
gem 'mocha', '~> 0.14', :require => false
group :doc do
# The current sdoc cannot generate GitHub links due