summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-18 09:04:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-18 09:04:21 +0000
commit5190fef9d61d20a5911dbeb7a35bdbee5e3c90d8 (patch)
tree419266fdda4fe99de42aa05d2a0222bf1defb8da /Gemfile
parent73762a7d62faaa98e0c97138150c9be03a8ae4d1 (diff)
downloadredmine-5190fef9d61d20a5911dbeb7a35bdbee5e3c90d8.tar.gz
redmine-5190fef9d61d20a5911dbeb7a35bdbee5e3c90d8.zip
Fix migration and use Rails 4.2.0 release (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13894 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index aa7d16735..2991b004a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
source 'https://rubygems.org'
-# gem "rails", "4.2.0"
-gem "rails", :git => "git://github.com/rails/rails.git", :branch => "4-2-stable"
+gem "rails", "4.2.0"
gem "jquery-rails", "~> 3.1.1"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"