Merged r17791 from trunk to 3.4-stable (#30413).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17793 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.gitignore b/.gitignore
index e19e36c2d2a54a1a1be5c0c5bf04f4fe8d5e5947..0c34fc6239bc3653a7db47ce8bcdad53ff9831de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /.loadpath
 /.powrc
 /.rvmrc
+/.ruby-version
 /config/additional_environment.rb
 /config/configuration.yml
 /config/database.yml

diff --git a/.hgignore b/.hgignore
index e1e895da3a0e848150534560cb3c5e43ff99c295..386a2138354efe0dbd1e6ea586257a64e99713d2 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -5,6 +5,7 @@ syntax: glob
 .loadpath
 .powrc
 .rvmrc
+.ruby-version
 config/additional_environment.rb
 config/configuration.yml
 config/database.yml