Commit Graph

5061 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
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
Go MAEDA
c2389242a9 Merged r17918 from trunk to 4.0-stable (#30955).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-03 22:33:24 +00:00
Go MAEDA
3ba9d27ddb Merged r17906 from trunk to 4.0-stable (#30256).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17912 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-03 01:46:24 +00:00
Go MAEDA
4f405ea0b2 Merged r17881 from trunk to 4.0-stable (#30818).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-18 15:13:02 +00:00
Go MAEDA
514e8b9112 Merged r17878 and r17879 from trunk to 4.0-stable (#30785).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17880 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-18 13:51:26 +00:00
Go MAEDA
4bb955c482 Merged r17868 from trunk to 4.0-stable (#30718).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-16 00:34:02 +00:00
Go MAEDA
d99cbe498f Merged r17862 from trunk to 4.0-stable (#30785).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17863 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-13 00:09:18 +00:00
Go MAEDA
0997aa22b5 Merged r17847 from trunk to 4.0-stable (#30434).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-03 23:24:16 +00:00
Jean-Philippe Lang
f460f64236 Merged r17817 to 4.0-stable (#30455).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-19 11:00:31 +00:00
Go MAEDA
9f19b7a148 Merged r17786 and r17787 from trunk to 4.0-stable (#30412).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-12 01:31:15 +00:00
Go MAEDA
592dd6f35f Merged r17764 from trunk to 4.0-stable (#30171).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17766 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-17 23:44:47 +00:00
Go MAEDA
c702b6275c Merged r17738 from trunk to 4.0-stable (#2635).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-16 04:20:17 +00:00
Jean-Philippe Lang
ec6218d4ee Random test failure.
git-svn-id: http://svn.redmine.org/redmine/trunk@17702 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-08 07:24:52 +00:00
Jean-Philippe Lang
4cba8d9599 Tests broken for SQLite3 (#30119).
git-svn-id: http://svn.redmine.org/redmine/trunk@17697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-08 06:40:29 +00:00
Go MAEDA
0aa87309f4 Add missing fixture for reports_controller_test (#30120).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17694 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-07 09:18:52 +00:00
Go MAEDA
c10df9f266 Include closed projects in search for scope subprojects (#28636).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 23:21:53 +00:00
Go MAEDA
1d5fd81871 Fix typo (#29503).
git-svn-id: http://svn.redmine.org/redmine/trunk@17691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 13:23:25 +00:00
Go MAEDA
e6e02e5e45 Discourage search engines from indexing old versions of wiki pages (#29503).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 00:40:39 +00:00
Go MAEDA
8a0a3bc8ed Current user should be nil to prevent ActiveJob::DeserializationError errors in tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@17689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 00:34:21 +00:00
Go MAEDA
91f788854d Current user should be nil to prevent ActiveJob::DeserializationError errors in tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@17688 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-04 10:29:56 +00:00
Go MAEDA
c9cf695ad7 Wrong columns after CSV export (#26785).
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17686 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-04 09:23:18 +00:00
Jean-Philippe Lang
3ba51f205d Let admins unarchive the project when trying to access an archived project (#29993).
git-svn-id: http://svn.redmine.org/redmine/trunk@17682 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 11:23:10 +00:00
Jean-Philippe Lang
12d1372ae5 Let admin users unarchive subprojects of archived projects (#29993).
git-svn-id: http://svn.redmine.org/redmine/trunk@17681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 11:13:28 +00:00
Jean-Philippe Lang
3c423df203 Don't send notifications when using Issue.generate! in tests in order to speed up tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@17680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 08:36:14 +00:00
Jean-Philippe Lang
0e9837e4d1 Current user should be nil to prevent ActiveJob::DeserializationError errors in tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@17679 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 07:54:49 +00:00
Jean-Philippe Lang
4ce9de94bc Tests failure with SQLite3.
ActiveRecord::RecordNotUnique: SQLite3::ConstraintException: UNIQUE constraint failed: custom_fields_trackers.custom_field_id, custom_fields_trackers.tracker_id: INSERT INTO "custom_fields_trackers" ("custom_field_id", "tracker_id") VALUES (?, ?)

git-svn-id: http://svn.redmine.org/redmine/trunk@17675 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-01 12:38:16 +00:00