Commit Graph

14189 Commits

Author SHA1 Message Date
Go MAEDA
a7ca24b99b Merged r19616 from trunk to 4.0-stable (#33196).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-24 22:37:49 +00:00
Go MAEDA
d320d4e191 Merged r19598 from trunk to 4.0-stable (#33156).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 07:07:49 +00:00
Go MAEDA
5e70917291 Merged r19595 from trunk to 4.0-stable (#19248).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19597 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 06:25:01 +00:00
Go MAEDA
b025c9408b Merged r19592 from trunk to 4.0-stable (#23645).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19594 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 04:56:20 +00:00
Go MAEDA
6323ef26ff Merged r19588 and r19589 from trunk to 4.0-stable (#33085).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 02:37:33 +00:00
Go MAEDA
f9b5eeb1af Merged r19581 from trunk to 4.0-stable (#33113).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-19 08:56:53 +00:00
Go MAEDA
fe7fd22a0c Merged r19566 from trunk to 4.0-stable (#32656).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19568 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-09 10:57:36 +00:00
Go MAEDA
23703c3afd Merged r19554 from trunk to 4.0-stable (#33052).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19558 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-04 07:47:30 +00:00
Go MAEDA
29dbf626b2 Merged r19550 from trunk to 4.0-stable (#33068).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19552 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-01 02:39:59 +00:00
Go MAEDA
3c733c84a6 Merged r19538 from trunk to 4.0-stable (#33059).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-29 14:27:23 +00:00
Go MAEDA
804f4f4772 Merged r19531 from trunk to 4.0-stable (#32449).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19533 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-27 01:22:06 +00:00
Go MAEDA
bc6101f97f Merged r19461 from trunk to 4.0-stable (#32788).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19463 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-26 01:16:19 +00:00
Go MAEDA
99548337a2 Merged r19440 from trunk to 4.0-stable (#32829).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-20 23:34:04 +00:00
Go MAEDA
1cee69a8fc Merged r19437 from trunk to 4.0-stable (#32772).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19439 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-19 02:44:29 +00:00
Go MAEDA
289329412c Merged r19425 from trunk to 4.0-stable (#32788).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-14 00:43:24 +00:00
Go MAEDA
5501453699 Merged r19416 from trunk to 4.0-stable (#32785).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19418 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-12 06:17:15 +00:00
Jean-Philippe Lang
a2975794c8 Merged r19396 to 4.0-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19397 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-20 11:41:49 +00:00
Go MAEDA
bc2a16128f Merged r19377 from trunk to 4.0-stable (#32526).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19379 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-19 00:57:38 +00:00
Go MAEDA
0ce51ecade Merged r19365 from trunk to 4.0-stable (#20277).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-12 14:56:01 +00:00
Go MAEDA
af845488c8 Merged r19358 from trunk to 4.0-stable (#32592).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-11 14:04:50 +00:00
Go MAEDA
6128b0b4b6 Merged r19345 from trunk to 4.0-stable (#32526).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19354 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-10 07:38:51 +00:00
Go MAEDA
c6f44540d6 Merged r19344 from trunk to 4.0-stable (#32526, #32525).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19353 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-10 04:36:47 +00:00
Go MAEDA
95c0d47399 Merged r19346 from trunk to 4.0-stable (#32422).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19350 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-10 01:35:56 +00:00
Go MAEDA
eba47e112e Merged r19341 from trunk to 4.0-stable (#32500).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19343 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-06 00:28:18 +00:00
Toshi MARUYAMA
0e321e6a86 Merged r19333 from trunk to 4.0-stable (#25742)
Filter all possibly class values on code tags in Textile.

Contributed by Holger Just from Planio.

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19335 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-05 12:05:12 +00:00
Jean-Philippe Lang
70d4865b1c Merged r17741 to 4.0-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19081 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-16 11:36:00 +00:00
Jean-Philippe Lang
09755c2966 Merged r18749 to 4.0-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-19 09:29:47 +00:00
Jean-Philippe Lang
cf8d0e1c83 Merged r18746 to 4.0-stable (#32294).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18747 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-19 09:18:13 +00:00
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