Commit Graph

14161 Commits

Author SHA1 Message Date
Jean-Philippe Lang
e9322b9057 Merged r18743 to 4.0-stable (#31779).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-19 08:37:16 +00:00
Go MAEDA
883b0004d3 Merged r18707 from trunk to 4.0-stable (#32290).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18708 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-17 14:06:40 +00:00
Toshi MARUYAMA
296c1fa68d Merged r18636 from trunk to 4.0-stable
fix assert_equal parameter is broken in test/functional/project_enumerations_controller_test.rb

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18637 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-09 07:33:50 +00:00
Go MAEDA
fe5e8b7d63 4.0-stable: Don't use sprockets 4.0.0 in order to avoid Sprockets::Railtie::ManifestNeededError (#32223).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18634 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-09 03:02:17 +00:00
Go MAEDA
ac7641109f Merged r18592 from trunk to 4.0-stable (#32184).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18599 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-06 00:31:53 +00:00
Go MAEDA
1eebb6af7e Merged r18589 from trunk to 4.0-stable (#32110).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-03 23:30:08 +00:00
Go MAEDA
74b4decefc Merged r18588 from trunk to 4.0-stable (#32189).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18590 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-03 23:28:00 +00:00
Go MAEDA
9ad9d855f7 Merged r18550 from trunk to 4.0-stable (#32170).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18581 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-02 00:59:08 +00:00
Toshi MARUYAMA
e53ac04cd8 Merged r18569 from trunk to 4.0-stable
fix duplicate name of IssuesControllerTest#test_bulk_copy_should_allow_copying_the_subtasks

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18574 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-30 13:37:13 +00:00
Toshi MARUYAMA
a73860a0a1 4.0-stable: add missing fixture added in trunk r17725
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-30 13:36:58 +00:00
Go MAEDA
e465ab6ec0 Merged r18377 from trunk to 4.0-stable (#31870).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18467 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-13 14:44:20 +00:00
Go MAEDA
4725c5b536 Merged r18435 from trunk to 4.0-stable (#32024).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 09:53:02 +00:00
Go MAEDA
2e71eda8c1 Merged r17761 from trunk to 4.0-stable (#32022).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18432 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 05:58:15 +00:00
Go MAEDA
481a575f5a Merged r18428 from trunk to 4.0-stable (#32012).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18429 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 00:01:37 +00:00
Go MAEDA
bf6e5e1f56 German translation update for 4.0-stable (#31951).
Contributed by Bernhard Rohloff.


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18399 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-08-27 00:59:45 +00:00
Go MAEDA
d7e0394eb5 Merged r18356 from trunk to 4.0-stable (#31778).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18359 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-08-09 09:37:07 +00:00
Go MAEDA
74b8b34868 Merged r18329 from trunk to 4.0-stable (#31742).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18336 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-07-31 09:11:16 +00:00
Go MAEDA
86d88ab336 Merged r18322 from trunk to 4.0-stable (#31552).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18324 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-30 05:37:47 +00:00
Go MAEDA
dc8be287b0 Merged r18269 from trunk to 4.0-stable in order to revert r18246 (#31582, #31365).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-20 07:06:30 +00:00
Jean-Philippe Lang
6d260195e1 Merged r18250 to 4.0-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 12:33:57 +00:00
Jean-Philippe Lang
cbb5df32de Merged r18247 to 4.0-stable (#31520).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 11:48:45 +00:00
Jean-Philippe Lang
ce7175f9f0 Merged r18245 to 4.0-stable (#31365).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 11:41:31 +00:00
Jean-Philippe Lang
33d685ef11 Merged r18243 to 4.0-stable (#31330).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 11:34:09 +00:00
Jean-Philippe Lang
3f101f8b07 Merged r17962, r18206, r18207 and r18211 to 4.0-stable (#30850).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 11:26:25 +00:00
Go MAEDA
bd8d4feed0 Backport the fix r18239 to 4.0-stable (#31503).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 02:07:46 +00:00
Go MAEDA
e3145ef654 Merged r18229 from trunk to 4.0-stable (#31438).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-06 22:32:00 +00:00
Go MAEDA
cf6f8aef8e Merged r18227 from trunk to 4.0-stable (#31511).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-05 23:20:55 +00:00
Go MAEDA
c916287df1 Merged r18193 from trunk to 4.0-stable (#31337).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18194 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-23 12:13:15 +00:00
Go MAEDA
02218c244a Merged r18165 from trunk to 4.0-stable (#31334).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18166 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-15 14:05:08 +00:00
Go MAEDA
3e9c9bbae4 Merged r18140 from trunk to 4.0-stable (#31311).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-08 22:26:27 +00:00
Go MAEDA
68ccc4a8ac Merged r17889 from trunk to 4.0-stable (#30811).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18129 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-05 02:02:38 +00:00
Go MAEDA
3a206e7ba1 Merged r18126 from trunk to 4.0-stable (#31125).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18127 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-05 01:37:23 +00:00
Go MAEDA
5b5298bac0 Merged r18122 from trunk to 4.0-stable (#29259).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18123 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-04 10:26:31 +00:00
Go MAEDA
b4562c3989 Merged r18118 from trunk to 4.0-stable (#31285).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18119 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-03 11:13:15 +00:00
Go MAEDA
300bd679c7 Merged r18106 from trunk to 4.0-stable (#31153).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18107 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 07:40:15 +00:00
Go MAEDA
002d065fe8 Merged r18103 from trunk to 4.0-stable (#31276).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 03:29:50 +00:00
Go MAEDA
eb2004f31a Merged r18087 from trunk to 4.0-stable (#31264).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18101 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 02:39:46 +00:00
Go MAEDA
bf153760d5 Merged r18098 and r18099 from trunk to 4.0-stable (#31275).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18100 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 02:35:10 +00:00
Go MAEDA
135e37245a Merged r18095 from trunk to 4.0-stable (#31268).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-29 12:06:05 +00:00
Go MAEDA
977615b097 Merged r18089 from trunk to 4.0-stable (#31268).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18090 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-28 00:21:32 +00:00
Go MAEDA
5f884487dc Merged r18066 from trunk to 4.0-stable (#30457).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18067 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-20 04:17:24 +00:00
Go MAEDA
fb6b7464aa Merged r18057 and r18058 from trunk to 4.0-stable (#30441).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18060 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-18 14:31:58 +00:00
Go MAEDA
b9e20c68a7 Merged r18046 from trunk to 4.0-stable (#31120).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-07 07:41:05 +00:00
Go MAEDA
0a01dc7366 Merged r18028 from trunk to 4.0-stable (#31113).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18029 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-31 11:07:56 +00:00
Jean-Philippe Lang
ebf2991245 Merged r18023 to 4.0-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18024 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-31 06:50:44 +00:00
Go MAEDA
137f05d527 Galician translation update for 4.0-stable (#31124).
Contributed by Guillermo ML.


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-31 03:43:53 +00:00
Jean-Philippe Lang
0db24c82a4 Merged r18015 to 4.0-stable (#31063).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18019 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-30 07:16:13 +00:00
Jean-Philippe Lang
86be45bed5 Merged r18014 to 4.0-stable (#30988).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-30 07:15:27 +00:00
Jean-Philippe Lang
dcbbee1c74 Merged r18013 to 4.0-stable (#30731).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-30 07:14:22 +00:00
Go MAEDA
1d6258250c Merged r18008 from trunk to 4.0-stable (#31087).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18009 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-26 14:39:58 +00:00