From: Go MAEDA <maeda@farend.jp>
Date: Sun, 13 Jan 2019 00:48:35 +0000 (+0000)
Subject: Merged r17791 from trunk to 4.0-stable (#30413).
X-Git-Tag: 4.0.1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=caf31d58c2c4a98402c1b0c1e9383078e61ac63e;p=redmine.git

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


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

diff --git a/.gitignore b/.gitignore
index e19e36c2d..0c34fc623 100644
--- 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 e1e895da3..386a21383 100644
--- 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