summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 17:37:16 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 17:37:16 +0000
commit2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch)
tree7a733c1cc51448ab69b3f892285305dbfb0ae15e /doc
parenta6ec78a4dc658e3517ed682792016b6530458696 (diff)
downloadredmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz
redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'doc')
-rw-r--r--doc/CHANGELOG2
-rw-r--r--doc/INSTALL5
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 01f598b8c..c55868d09 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -86,7 +86,7 @@ http://www.redmine.org/
* Defect #16655: start_date not set despite settings[default_issue_start_date_to_creation_date] being set.
* Defect #16668: Redmine links broken when object name contains special characters
* Defect #16669: Markdown formatter should use the :no_intra_emphasis extension
-* Defect #16708: Form is submitted when switching tab
+* Defect #16708: Form is submitted when swithing tab
* Defect #16739: custom_fields.json only returns single tracker instead of array of trackers
* Defect #16747: Remove useless settings when editing a query from the gantt
* Defect #16755: Field set as read-only still available in the issues list context menu
diff --git a/doc/INSTALL b/doc/INSTALL
index 21ae70c2f..68fd230e2 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
== Requirements
-* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0 or 2.1
+* Ruby >= 1.9.3
* RubyGems
* Bundler >= 1.0.21
@@ -30,9 +30,6 @@ Optional:
3. Configure the database parameters in config/database.yml
for the "production" environment (default database is MySQL and ruby1.9)
- If you're running Redmine with MySQL and ruby1.8, replace the adapter name
- with `mysql`
-
4. Install the required gems by running:
bundle install --without development test