summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r13861 and r13862 (#18789).Jean-Philippe Lang2015-01-102-1/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13852 and r13853 (#18769).Jean-Philippe Lang2015-01-106-6/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13850 (#18734).Jean-Philippe Lang2015-01-101-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13865 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin pg version 0.17 on all platformsToshi MARUYAMA2015-01-041-2/+1
| | | | | | | 2.6-stable uses Rails 3.2 and passes test described at trunk r13839. But this revision prevents unexpected changes due to pg version change. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13840 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13836 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-1/+0
| | | | | | | | remove duplicated :remote key from app/views/messages/show.html.erb Ruby 2.2 shows warning. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13838 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13835 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-2/+2
| | | | | | | | remove duplicated :id key from app/views/timelog/report.html.erb Ruby 2.2 shows warning. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13837 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13831 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-041-1/+1
| | | | | | | | | | | | | | | fix Ruby 2.2 warning at lib/redmine/scm/adapters/cvs_adapter.rb. On ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-linux]: <pre> lib/redmine/scm/adapters/cvs_adapter.rb:342: warning: Comparable#== will no more rescue exceptions of #<=> in the next release. lib/redmine/scm/adapters/cvs_adapter.rb:342: warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison. </pre> git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13834 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: simplify rmagick version definitionToshi MARUYAMA2015-01-041-5/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install errorToshi MARUYAMA2015-01-041-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13832 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13829 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-1/+1
| | | | | | | | Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11. 1.3.13 breaks test/functional/issues_controller_test.rb. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13830 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin i18n version 0.6 on all platformsToshi MARUYAMA2015-01-031-1/+1
| | | | | | i18n 0.7 is installed on jruby. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13828 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13826 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-0/+2
| | | | | | add jruby-21mode to .travis.yml. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13827 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13819 from trunk to 2.6-stable (#18587)Toshi MARUYAMA2015-01-031-32/+27
| | | | | | Swedish translation updated by Khedron Wilk. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13820 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: fix r13807 on Ruby 1.8.7Toshi MARUYAMA2014-12-262-3/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13817 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2Toshi MARUYAMA2014-12-261-1/+1
| | | | | | i18n 0.7 requires Ruby version >= 1.9.3 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13816 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on ↵Toshi MARUYAMA2014-12-261-1/+7
| | | | | | Ruby 1.8.7 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed order syntax for Rails 3 (#18667).Jean-Philippe Lang2014-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13810 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r13805 (#18679).Jean-Philippe Lang2014-12-262-30/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13807.Jean-Philippe Lang2014-12-262-1/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13786 and r13789 (#18679).Jean-Philippe Lang2014-12-262-1/+30
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13768 (#18685).Jean-Philippe Lang2014-12-261-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13787 (#18667).Jean-Philippe Lang2014-12-262-4/+15
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13785 (#18665).Jean-Philippe Lang2014-12-263-8/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13677 (#18501).Jean-Philippe Lang2014-12-262-2/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13670 (#18499).Jean-Philippe Lang2014-12-262-0/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13659 (#18464).Jean-Philippe Lang2014-12-261-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13799 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13784 (#14699).Jean-Philippe Lang2014-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13684 from trunk to 2.6-stable (#18534, #18502)Toshi MARUYAMA2014-12-021-2/+2
| | | | | | Galician (gl) translation updated by Adrián Chaves Fernández. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13685 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13638 (#18060).Jean-Philippe Lang2014-11-232-1/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: fix syntax error on Ruby 1.8.7 (#18280)Toshi MARUYAMA2014-11-221-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13640 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13625 (#18410).Jean-Philippe Lang2014-11-221-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13610 (#18357).Jean-Philippe Lang2014-11-221-21/+38
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13636 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13486 to r13489 and r13492 (#8817).Jean-Philippe Lang2014-11-225-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13635 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13593 (#17705).Jean-Philippe Lang2014-11-222-1/+25
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13477 (#18051).Jean-Philippe Lang2014-11-221-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13592, r13594, r13599 (#18349).Jean-Philippe Lang2014-11-222-1/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13632 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r13560 and r13569 (#18280).Jean-Philippe Lang2014-11-222-1/+61
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13562 (#18269).Jean-Philippe Lang2014-11-222-4/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13557 (#17744).Jean-Philippe Lang2014-11-222-1/+21
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13556 (#13673).Jean-Philippe Lang2014-11-222-0/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13555 (#13608).Jean-Philippe Lang2014-11-222-0/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: update Rails to 3.2.21Toshi MARUYAMA2014-11-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13612 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13531 from trunk to 2.6-stable (#18252)Toshi MARUYAMA2014-11-011-9/+9
| | | | | | Japanese wiki_syntax_detailed.html translation updated by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13532 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: update Rails to 3.2.20Toshi MARUYAMA2014-10-311-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13530 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13506 from trunk to 2.6-stable (#18176)Toshi MARUYAMA2014-10-251-1/+1
| | | | | | Gemfile: update rbpdf to version 1.18.2. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13507 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13493 from trunk to 2.6-stable (#18156)Toshi MARUYAMA2014-10-231-28/+29
| | | | | | Spanish wiki_syntax.html translation updated by Jesus Gutierrez de la Vega. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13494 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13479 from trunk to 2.6-stable (#18157)Toshi MARUYAMA2014-10-221-2/+2
| | | | | | German translation updated by Gundolf Dampf. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13481 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13478 from trunk to 2.6-stable (#18156)Toshi MARUYAMA2014-10-221-8/+8
| | | | | | Spanish translation updated by Jesus Gutierrez de la Vega. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13480 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13471.Jean-Philippe Lang2014-10-212-1/+73
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13472 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13464 (#18144).Jean-Philippe Lang2014-10-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13465 e93f8b46-1217-0410-a6f0-8f06a7374b81
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-02 06:08:24 +0000