5086 Commits

Author SHA1 Message Date
Go MAEDA
4862a18813 Merged r20819 from trunk to 4.0-stable (#33360).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-03-18 08:57:39 +00:00
Go MAEDA
d4edf7cda6 Merged r20783 from trunk to 4.0-stable (#33548).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20785 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-03-14 06:59:31 +00:00
Go MAEDA
62c65afd00 Merged r20768 from trunk to 4.0-stable (#33459).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20770 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-03-10 00:56:15 +00:00
Go MAEDA
58efae893c Merged r20738 from trunk to 4.0-stable (#34615).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-02-08 06:24:24 +00:00
Go MAEDA
827793f01d Merged r20694 from trunk to 4.0-stable (#34375).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-12-29 07:14:50 +00:00
Go MAEDA
a606f95883 Merged r20693 from trunk to 4.0-stable (#34297).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20696 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-12-29 07:07:54 +00:00
Go MAEDA
127e2dd03b Merged r18353 from trunk to 4.0-stable (#34461).
This merge is intended to update Redcarpet from 3.4 to 3.5 before merging r20665 which updates Redcarpet to 3.5.1.


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20667 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-12-18 05:13:58 +00:00
Go MAEDA
dd73415d53 Merged r20094 from trunk to 4.0-stable (#33769).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-09-30 13:57:52 +00:00
Go MAEDA
82c2c4f533 Merged r19999 from trunk to 4.0-stable (#33926).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-09-02 08:48:36 +00:00
Go MAEDA
565574e3be Merged r19976 from trunk to 4.0-stable (#33175).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-08-15 23:05:18 +00:00
Go MAEDA
ee1f94c7f2 Merged r19975 from trunk to 4.0-stable (#33689).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-08-15 07:49:52 +00:00
Go MAEDA
1f501b7b74 Merged r19935 from trunk to 4.0-stable (#33140).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19937 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-07-25 08:55:25 +00:00
Go MAEDA
4585a24ffe Merged r19844 from trunk to 4.0-stable (#6734).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-07-04 00:53:52 +00:00
Go MAEDA
61532dde04 Merged r19818 from trunk to 4.0-stable (#33576).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-06-14 07:00:46 +00:00
Jean-Philippe Lang
041bee750d Merged r19646 to 4.0-stable (#33075).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 08:15:19 +00:00
Jean-Philippe Lang
37d5ad72a6 Merged r19486 to 19488 to 4.0-stable (#32850).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19648 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 08:06:14 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Go MAEDA
f3232146ac Merged r18005 from trunk to 4.0-stable (#30923).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-25 03:48:44 +00:00
Jean-Philippe Lang
956eb1b7fa Merged r17966 to 4.0-stable (#31030).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 09:50:31 +00:00
Jean-Philippe Lang
4833318c3d Merged r17949 to 4.0-stable (#29055).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:29:10 +00:00
Go MAEDA
24af62b16c Merged r17935 from trunk to 4.0-stable (#30985).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-09 15:22:30 +00:00
Go MAEDA
5a1b03eeaf Merged r17931 from trunk to 4.0-stable (#30977).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-06 23:23:39 +00:00