Commit Graph

13583 Commits

Author SHA1 Message Date
Jean-Philippe Lang
55eb4e8dc2 Merged r18746 to 3.4-stable (#32294).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-19 09:18:27 +00:00
Jean-Philippe Lang
237ba49b3e Merged r18743 to 3.4-stable (#31779).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-19 08:37:25 +00:00
Go MAEDA
3cfd1d0c3d Merged r18707 from trunk to 3.4-stable (#32290).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-17 14:07:52 +00:00
Toshi MARUYAMA
7d138ae575 Merged r18636 from trunk to 3.4-stable
fix assert_equal parameter is broken in test/functional/project_enumerations_controller_test.rb

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18638 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-09 07:35:22 +00:00
Go MAEDA
880d43532a 3.4-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/3.4-stable@18635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-09 07:12:09 +00:00
Go MAEDA
26135ab54c Merged r18592 from trunk to 3.4-stable (#32184).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-06 00:33:17 +00:00
Go MAEDA
ed886ec7d7 Merged r18550 from trunk to 3.4-stable (#32170).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18582 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-10-02 01:06:59 +00:00
Toshi MARUYAMA
d77854a666 Merged r18569 from trunk to 3.4-stable
fix duplicate name of IssuesControllerTest#test_bulk_copy_should_allow_copying_the_subtasks

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-30 13:39:19 +00:00
Go MAEDA
ccb2a6d3ca Merged r18435 from trunk to 3.4-stable (#32024).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 09:54:08 +00:00
Go MAEDA
bc4cc0a14a Merged r17761 from trunk to 3.4-stable (#32022).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18433 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 07:00:36 +00:00
Go MAEDA
a14ff53ee5 Merged r18428 from trunk to 3.4-stable (#32012).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18430 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-09-05 00:03:23 +00:00
Go MAEDA
dedcde4f07 Merged r18356 from trunk to 3.4-stable (#31778).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-08-09 09:50:20 +00:00
Jean-Philippe Lang
7b2482f5ba Updates for 3.4.11 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 12:34:37 +00:00
Jean-Philippe Lang
90ee0d2902 Merged r18247 to 3.4-stable (#31520).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 11:49:48 +00:00
Go MAEDA
92a74472f3 Backport the fix r18239 to 3.4-stable (#31503).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18241 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-10 02:09:31 +00:00
Go MAEDA
ad816523ed Merged r18165 from trunk to 3.4-stable (#31334).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-15 14:06:07 +00:00
Go MAEDA
fc570654f9 Merged r18140 from trunk to 3.4-stable (#31311).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-08 22:27:20 +00:00
Go MAEDA
0dd2493e79 Merged r17889 from trunk to 3.4-stable (#30811).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-05 02:03:34 +00:00
Go MAEDA
bf39410402 Merged r18126 from trunk to 3.4-stable (#31125).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18128 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-05 01:37:57 +00:00
Go MAEDA
a08c192606 Merged r18106 from trunk to 3.4-stable (#31153).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18108 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 07:41:02 +00:00
Go MAEDA
5490963223 Merged r18103 from trunk to 3.4-stable (#31276).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 03:33:17 +00:00
Go MAEDA
f2c50effe8 Merged r18087 from trunk to 3.4-stable (#31264).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18102 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-30 02:40:26 +00:00
Go MAEDA
2fb11b6730 Merged r18066 from trunk to 3.4-stable (#30457).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-20 04:18:34 +00:00
Go MAEDA
d8ee0bb008 Merged r18046 from trunk to 3.4-stable (#31120).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18048 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-04-07 07:42:58 +00:00
Jean-Philippe Lang
5fc54010ca Updates for 3.4.10 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18025 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-31 06:52:06 +00:00
Go MAEDA
ed8bf602b2 Merged r18008 from trunk to 3.4-stable (#31087).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18010 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-26 14:41:30 +00:00
Go MAEDA
e7cbfb012b Merged r18005 from trunk to 3.4-stable (#30923).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18007 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-25 03:50:16 +00:00
Jean-Philippe Lang
1e02fa43e3 Merged r17952 to 3.4-stable (#30872).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:38:00 +00:00
Jean-Philippe Lang
6626f87e55 Merged r17949 to 3.4-stable (#29055).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:30:02 +00:00
Go MAEDA
d35594d444 Upgrade to Rails 4.2.11.1 (#31027).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-14 00:44:39 +00:00
Go MAEDA
6a47de207f Merged r17933 from trunk to 4.0-stable (#30367).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-13 15:25:14 +00:00
Go MAEDA
c47049c5cc Merged r17909 from trunk to 3.4-stable (#30939).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17911 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-02 03:07:44 +00:00
Jean-Philippe Lang
3579f773e8 Updates for 3.4.9 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-21 16:41:45 +00:00
Go MAEDA
087309ae1a Merged r17881 from trunk to 3.4-stable (#30818).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17886 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-19 09:37:50 +00:00
Go MAEDA
797c83f7c8 Merged r17875 from trunk to 3.4-stable (#30821).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17877 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-18 08:40:24 +00:00
Go MAEDA
521004b70e Use xpath < 3.2 for Ruby < 2.3 (#30114).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-10 15:42:22 +00:00
Jean-Philippe Lang
ecdbede7a5 Merged r17831 to 3.4-stable (#30411).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17833 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-20 07:40:40 +00:00
Jean-Philippe Lang
e41b167116 Updates for 3.4.8.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-20 06:56:02 +00:00
Jean-Philippe Lang
879a970889 Merged r17812 to 3.4-stable (#29951).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17814 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-19 10:48:07 +00:00
Go MAEDA
e1fbcd0a67 Merged r17806 from trunk to 3.4-stable (#30426).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17808 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-18 09:08:12 +00:00
Go MAEDA
beb0768d82 Merged r17803 from trunk to 3.4-stable in order to revert r17802 (#30426).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-17 01:20:36 +00:00
Go MAEDA
cda5ceae5e Merged r17800 from trunk to 3.4-stable (#30426).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-16 07:20:49 +00:00
Go MAEDA
a9f10956ec Merged r17791 from trunk to 3.4-stable (#30413).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-13 00:50:34 +00:00
Go MAEDA
1f0a1f65ca Merged r17786 and r17787 from trunk to 3.4-stable (#30412).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-12 01:34:18 +00:00
Go MAEDA
62412a4e50 Require bundler >= 1.5.0 and < 2.0.0 (#30353).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-10 03:13:49 +00:00
Go MAEDA
da5630c12a Ukrainian translation update for 3.4-stable (#30293).
Patch by Dima Samodurov.


git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-30 06:34:13 +00:00
Go MAEDA
55ef1f4585 Merged r17764 from trunk to 3.4-stable (#30171).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17768 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-17 23:48:58 +00:00
Go MAEDA
312c067b32 Merged r17763 from trunk to 3.4-stable (#30171).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17767 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-17 23:47:52 +00:00
Jean-Philippe Lang
64889c6c07 Updates for 3.4.7 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-09 06:36:24 +00:00
Go MAEDA
b543e7dc35 Merged r17692 from trunk to 3.4-stable (#28636).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17693 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-07 00:54:38 +00:00