diff options
| author | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
|---|---|---|
| committer | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
| commit | 549d171a90135999e3c670f489494b7a39dd6dd7 (patch) | |
| tree | 233466527b797fe3ea7c6a7a3673795cea28aebe /guides/bug_report_templates/action_controller_gem.rb | |
| parent | c840b18ac31a852d99ff760229f2c087b6961727 (diff) | |
| parent | 70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff) | |
| download | rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.gz rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.bz2 rails-549d171a90135999e3c670f489494b7a39dd6dd7.zip | |
Merge branch 'master' into pr/18316
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'guides/bug_report_templates/action_controller_gem.rb')
| -rw-r--r-- | guides/bug_report_templates/action_controller_gem.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb index c06a653e2d..e04d79c818 100644 --- a/guides/bug_report_templates/action_controller_gem.rb +++ b/guides/bug_report_templates/action_controller_gem.rb @@ -1,5 +1,5 @@ # Activate the gem you are reporting the issue against. -gem 'rails', '5.0.0' +gem 'rails', '4.2.0' require 'rails' require 'action_controller/railtie' |