]>
source.dussan.org Git - redmine.git/log
Toshi MARUYAMA [Mon, 14 Sep 2015 07:55:30 +0000 (07:55 +0000)]
2.6-stable: travis: upgrade jruby-9.0.0.0 to jruby-9.0.1.0
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14580
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 14 Sep 2015 05:07:06 +0000 (05:07 +0000)]
2.6-stable: travis: allow failures on jruby-9.0.0.0 postgresql
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14570
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 13 Sep 2015 14:52:58 +0000 (14:52 +0000)]
Use redcarpet 3.3 if using ruby 1.9 and higher (#20735).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14567
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 13 Sep 2015 14:45:20 +0000 (14:45 +0000)]
Merged r14560 and r14561 (#19577).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14564
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 30 Aug 2015 05:16:02 +0000 (05:16 +0000)]
Merged r14416 and r14530 from trunk to 2.6-stable
travis: add PostgreSQL environments
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14532
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 30 Aug 2015 00:26:25 +0000 (00:26 +0000)]
2.6-stable: travis: add jruby 9000
refer:
https://github.com/travis-ci/travis-ci/issues/4720
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14527
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 18 Aug 2015 13:47:30 +0000 (13:47 +0000)]
Merged r14513 from trunk to 2.6-stable (#20452, #20557)
Czech translation for 2.6-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14515
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 26 Jul 2015 14:16:51 +0000 (14:16 +0000)]
Merged r14459 from trunk to 2.6-stable (#20338, #20408)
Turkish translation for 2.6-stable updated by Giray Pultar.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14467
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 12 Jul 2015 09:55:58 +0000 (09:55 +0000)]
Merged r14428 from trunk to 2.6-stable (#20199, #20294)
Russian translation for 2.6-stable updated.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14436
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 12 Jul 2015 05:07:56 +0000 (05:07 +0000)]
Merged r14351 from trunk to 2.6-stable (#19825, #20293)
Russian translation update.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14427
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 7 Jul 2015 19:44:31 +0000 (19:44 +0000)]
Updates for 2.6.6 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14424
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 5 Jul 2015 10:30:21 +0000 (10:30 +0000)]
Merged r14389 (#20203).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14402
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 5 Jul 2015 10:23:24 +0000 (10:23 +0000)]
Merged r14396 (#17757).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14399
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 28 Jun 2015 09:19:25 +0000 (09:19 +0000)]
Merged r14381.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14384
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 21 Jun 2015 09:51:52 +0000 (09:51 +0000)]
Merged r14360 from trunk to 2.6-stable (#20142)
update Gemfile to require rbpdf ~>1.18.6.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14362
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 20 Jun 2015 04:15:33 +0000 (04:15 +0000)]
Merged r14351 from trunk to 2.6-stable (#19825)
Russian translation update.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14358
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 20 Jun 2015 04:15:22 +0000 (04:15 +0000)]
Merged r14350 from trunk to 2.6-stable (#20035)
Italian translation update.
Patch by Daniele Renda.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14357
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 18 Jun 2015 07:16:44 +0000 (07:16 +0000)]
Merged r14329 from trunk to 2.6-stable (#19252)
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.
sqlite-jdbc was updated to 3.8.10.1 in upstream.
https://github.com/jruby/activerecord-jdbc-adapter/commit/
f7a20b0d577fad569d6f375d3b8f1e63dd02266b
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14331
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 17 Jun 2015 13:59:02 +0000 (13:59 +0000)]
Merged r14323 from trunk to 2.6-stable.
Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14325
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 17 Jun 2015 11:15:54 +0000 (11:15 +0000)]
2.6-stable: add Ruby 2.2 to .travis.yml (#19652)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14321
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 17 Jun 2015 11:09:36 +0000 (11:09 +0000)]
2.6-stable: Gemfile: update Rails to 3.2.22
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14320
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 30 May 2015 08:19:20 +0000 (08:19 +0000)]
Merged r14281 (#19956).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14283
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 30 May 2015 08:11:05 +0000 (08:11 +0000)]
Merged r14267 (#19840).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14280
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 30 May 2015 08:09:48 +0000 (08:09 +0000)]
Merged r14268 (#19815).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14278
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 May 2015 08:00:00 +0000 (08:00 +0000)]
Updates for 2.6.5 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14257
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 May 2015 07:30:50 +0000 (07:30 +0000)]
Merged r14237 (#19735).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14255
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 May 2015 07:29:40 +0000 (07:29 +0000)]
Merged r14239 and r14240 (#19706).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14254
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 May 2015 07:26:52 +0000 (07:26 +0000)]
Merged r14245 (#19655).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14253
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 May 2015 07:25:38 +0000 (07:25 +0000)]
Merged r14242 (#18580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14252
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 26 Apr 2015 06:48:42 +0000 (06:48 +0000)]
Updates for 2.6.4 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14225
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 25 Apr 2015 07:46:28 +0000 (07:46 +0000)]
Merged r14160 (#19580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14212
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 25 Apr 2015 07:44:57 +0000 (07:44 +0000)]
Backported r14179 (#19569).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14211
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 25 Apr 2015 07:20:53 +0000 (07:20 +0000)]
Merged r14164 (#19538).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14200
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 25 Apr 2015 07:18:20 +0000 (07:18 +0000)]
Merged r14156 and r14161 (#19400).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14198
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 19 Apr 2015 10:27:50 +0000 (10:27 +0000)]
Merged r14157 from trunk to 2.6-stable (#19444).
Typo in wiki_syntax_detailed.html.
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14184
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 17 Apr 2015 09:57:53 +0000 (09:57 +0000)]
2.6-stable: Gemfile: add gems to test group for Ruby 2.2 (#19652)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14181
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 14 Apr 2015 12:58:10 +0000 (12:58 +0000)]
Merged r14175 from trunk to 2.6-stable (#19252)
Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.
r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14177
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 14 Apr 2015 06:55:25 +0000 (06:55 +0000)]
Merged r14172 from trunk to 2.6-stable
.travis.yml: replace DATABASE_ADAPTER to DB
Prevent travis UI confusion.
* https://github.com/travis-ci/travis-ci/issues/3386
* https://github.com/travis-ci/travis-ci/issues/3402
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14174
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 14 Apr 2015 05:35:57 +0000 (05:35 +0000)]
Merged r14167 from trunk to 2.6-stable
Gemfile: pin rmagick version 2.13
rmagick 2.14 prints
'[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14169
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 21 Mar 2015 08:29:59 +0000 (08:29 +0000)]
Merged r14142 and r14143 (#19400).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14148
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 20 Mar 2015 09:52:00 +0000 (09:52 +0000)]
Backported r14137 (#19297).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14139
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 19 Mar 2015 06:12:18 +0000 (06:12 +0000)]
Merged r14132 from trunk to 2.6-stable
.travis.yml: replace TEST_SUITE to SUITE
Prevent travis UI confusion.
https://github.com/travis-ci/travis-ci/issues/3386
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14134
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 18 Mar 2015 13:56:04 +0000 (13:56 +0000)]
Merged r14076 from trunk to 2.6-stable
.travis.yml: move "matrix" after "env"
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14130
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 18 Mar 2015 13:55:53 +0000 (13:55 +0000)]
Merged r14012 from trunk to 2.6-stable
add redmine.org issue link of jruby IO.popen() at .travis.yml (#19091)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14129
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 16 Mar 2015 23:14:51 +0000 (23:14 +0000)]
Merged r14118 from trunk to 2.6-stable
Gemfile: remove "ffi"
ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-
81405252
r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14127
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 16 Mar 2015 18:26:05 +0000 (18:26 +0000)]
Updates for 2.6.3 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14123
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 16 Mar 2015 04:55:45 +0000 (04:55 +0000)]
2.6-stable: fix unit test on Ruby 1.8.7 (#19305)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14119
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 20:26:34 +0000 (20:26 +0000)]
Merged r14115 (#19305).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 18:13:58 +0000 (18:13 +0000)]
Merged r14112 (#19305).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14114
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 14:08:00 +0000 (14:08 +0000)]
Merged r14108 (#19348).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14110
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 10:08:04 +0000 (10:08 +0000)]
Redcarpet not available with jruby (#19313).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14105
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 10:03:45 +0000 (10:03 +0000)]
Merged r14102 (#19381).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14104
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 14 Mar 2015 16:37:15 +0000 (16:37 +0000)]
Merged r14078 and r14097 from trunk to 2.6-stable
Building ffi 1.9.7 fails in Ubuntu.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14099
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 14 Mar 2015 14:59:13 +0000 (14:59 +0000)]
Merged r14080 (#19313).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14089
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 8 Mar 2015 09:42:51 +0000 (09:42 +0000)]
Merged r14050 (#19260).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14059
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 8 Mar 2015 09:41:42 +0000 (09:41 +0000)]
Merged r14049 (#19197).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14057
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Thu, 19 Feb 2015 19:05:22 +0000 (19:05 +0000)]
Updates for 2.6.2 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14040
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:43:56 +0000 (11:43 +0000)]
Merged r14025 (#19120).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14026
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:42:11 +0000 (11:42 +0000)]
Merged r14015 (#19065).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14024
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:35:45 +0000 (11:35 +0000)]
Merged r13955 (#18961).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14023
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:35:02 +0000 (11:35 +0000)]
Merged r13961 (#18922).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14022
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:34:25 +0000 (11:34 +0000)]
Merged r13922 (#18896).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:33:40 +0000 (11:33 +0000)]
Merged r13921 (#18894).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:31:46 +0000 (11:31 +0000)]
Merged r13913, r13918 and r13919 (#18883).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14019
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:29:57 +0000 (11:29 +0000)]
Merged r14014 (#17722).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 17 Feb 2015 18:00:24 +0000 (18:00 +0000)]
Merged r14016 (#19117).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 12:23:30 +0000 (12:23 +0000)]
Merged r13943 from trunk to 2.6-stable (#18632)
require rbpdf 1.18.5.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13987
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:39:00 +0000 (10:39 +0000)]
Merged r13977 from trunk to 2.6-stable (#10681, #18586)
pdf: remove styles by fontname instated of Arabic/Persian/Thai locale.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13984
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:38:48 +0000 (10:38 +0000)]
Merged r13976 from trunk to 2.6-stable (#10681, #18586)
pdf: remove styles of Arabic/Persian Italic and Thai Bold.
Contributed by Jun NAITOH.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13983
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:38:33 +0000 (10:38 +0000)]
Merged r13729 from trunk to 2.6-stable (#16040, #18586, #10681)
pdf: use DejaVuSans font in Arabic and Persian.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13982
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 16 Jan 2015 04:42:04 +0000 (04:42 +0000)]
Merged r13880 from trunk to 2.6-stable
remove jruby-21mode from .travis.yml
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13884
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 11 Jan 2015 09:16:37 +0000 (09:16 +0000)]
Merged r13874, updates for 2.6.1 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13875
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 11 Jan 2015 09:12:51 +0000 (09:12 +0000)]
Copyright update in 2.6-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 11 Jan 2015 04:22:53 +0000 (04:22 +0000)]
Merged r13870 from trunk to 2.6-stable (#18629)
Gemfile: update rbpdf version to 1.18.4.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13871
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:22:10 +0000 (21:22 +0000)]
Merged r13615 (#18777).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13869
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:12:42 +0000 (21:12 +0000)]
Merged r13860 (#18782).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:12:07 +0000 (21:12 +0000)]
Merged r13861 and r13862 (#18789).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:10:18 +0000 (21:10 +0000)]
Merged r13852 and r13853 (#18769).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:09:29 +0000 (21:09 +0000)]
Merged r13850 (#18734).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13865
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 07:42:05 +0000 (07:42 +0000)]
2.6-stable: Gemfile: pin pg version 0.17 on all platforms
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
Toshi MARUYAMA [Sun, 4 Jan 2015 04:48:03 +0000 (04:48 +0000)]
Merged r13836 from trunk to 2.6-stable
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
Toshi MARUYAMA [Sun, 4 Jan 2015 04:47:55 +0000 (04:47 +0000)]
Merged r13835 from trunk to 2.6-stable
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
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:19 +0000 (02:57 +0000)]
Merged r13831 from trunk to 2.6-stable.
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
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:11 +0000 (02:57 +0000)]
2.6-stable: Gemfile: simplify rmagick version definition
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:03 +0000 (02:57 +0000)]
2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install error
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13832
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 3 Jan 2015 16:23:53 +0000 (16:23 +0000)]
Merged r13829 from trunk to 2.6-stable.
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
Toshi MARUYAMA [Sat, 3 Jan 2015 16:04:55 +0000 (16:04 +0000)]
2.6-stable: Gemfile: pin i18n version 0.6 on all platforms
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
Toshi MARUYAMA [Sat, 3 Jan 2015 16:04:46 +0000 (16:04 +0000)]
Merged r13826 from trunk to 2.6-stable.
add jruby-21mode to .travis.yml.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13827
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 3 Jan 2015 11:22:04 +0000 (11:22 +0000)]
Merged r13819 from trunk to 2.6-stable (#18587)
Swedish translation updated by Khedron Wilk.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13820
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 26 Dec 2014 16:06:44 +0000 (16:06 +0000)]
2.6-stable: fix r13807 on Ruby 1.8.7
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13817
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 26 Dec 2014 14:57:46 +0000 (14:57 +0000)]
2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2
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
Toshi MARUYAMA [Fri, 26 Dec 2014 14:35:30 +0000 (14:35 +0000)]
2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 11:46:34 +0000 (11:46 +0000)]
Fixed order syntax for Rails 3 (#18667).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13810
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 11:43:59 +0000 (11:43 +0000)]
Reverts r13805 (#18679).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 11:41:05 +0000 (11:41 +0000)]
Merged r13807.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:48:17 +0000 (10:48 +0000)]
Merged r13786 and r13789 (#18679).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:47:06 +0000 (10:47 +0000)]
Merged r13768 (#18685).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:46:29 +0000 (10:46 +0000)]
Merged r13787 (#18667).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:45:18 +0000 (10:45 +0000)]
Merged r13785 (#18665).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:43:15 +0000 (10:43 +0000)]
Merged r13677 (#18501).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
projects / redmine.git / log