198e92d26b
Merged r13390 (#17163).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13397 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
5f184f9fd1
Merged r13334 (#17486).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13389 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
51e4705d0e
Merged r13213 (#16530).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13225 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
e4e7d1b6bd
Merged r13216, r13217 (#17003).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13222 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
0341094005
Merged r13219 (#3483).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13221 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
5baf46b640
Merged r13199 from trunk to 2.5-stable (#17151)
Fix file upload broken on Chrome 36.
Contributed by Felix Schäfer.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13201 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
5ecad330d9
Merged r13198 from trunk to 2.5-stable (#17235)
Prevent "can't modify frozen String" exception when mail sending error.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13200 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
72d81e9b6f
Merged r13168 (#16747).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13192 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
221c8392c6
Merged r13140 and r13142 (#16795).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13162 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
cc37898d15
Merged r13124 (#16755).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13161 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
6b0b38b863
Merged r13109 (#16739).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13160 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
f20b2d6d77
Merged r13108 (#16708).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13159 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
d84c3d35f0
Merged r13106 (#16668).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13157 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
7352f1781b
Merged r13104 (#16655).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13156 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
fb0c262f8f
Merged r13126 (#16619).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13155 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
23b322772d
Merged r13127 (#16564).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13154 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
983ec24a97
2.5-stable: revert r13111 and r13113 (#16685)
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13120 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
83fe35d3d2
Merged r13110 from trunk to 2.5-stable (#16685)
introduce request_store to ensure that the current user doesn't leak across request boundaries.
Contributed by Holger Just.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13111 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
f155a1ada6
Merged r13101 from trunk to 2.5-stable (#16711)
fix non-ascii attachment file name get corrupted in IE11.
Contributed by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13102 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
aeb72db1a9
Merged r13052 (#3177).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13053 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
7e705071a5
Merged r13042 to r13044 (#3177).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13049 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
cf36ba1572
Merged r13041 (#16511).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13048 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
6c0f393ad1
Merged r13040 (#16467).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13046 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
a8d3f491e6
Merged r13029 (#16415).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13030 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
1807093b75
Merged r13018 (#16466).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13027 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
665767db44
Merged r12969 and r12973 (#16353).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13026 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
23ae3d1fa6
Merged r12986 (#16381).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13025 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
2344dfe7f7
Merged r12968 (#16319).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13024 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
33a7f6bc11
Merged r12990 and r12991 (#16326).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13023 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
65c9223fe5
Merged r12990 (#16338).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13022 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
df7f00afce
Merged r12970 (#16259).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13021 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
c5b52ec29f
Merged r12989 and r12997 (#16236).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13020 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
58786e8d80
Merged r12985 (#14298).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13019 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
c61a6a707f
Merged r12971 (#16255).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12979 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
5b1799f245
Merged r12896 (#16081).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12945 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
8b1a61d856
Merged r12941 (#16161).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12942 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
9cb17f598d
Merged r12938 (#16169).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12939 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
51175ede2c
revert r12925 of 2.5-stable
I mistook to commit in stable branch.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12926 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
9abdbd423d
prevent issue tree hierarchy is broken in race conditions (#6579)
awesome_nested_set 2.1.6 uses lock.
Issue model uses as same way.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12925 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
63212e5c16
Merged r12915 to 12918 (#16107).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
88b3872179
Merged r12914 (#16134).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12922 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
066e9b7f94
Merged r12912 and r12913 from trunk.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12921 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
805debddd0
Merged r12910 and r12911 (#16091).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
8b9a2ff871
Merged r12897.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12898 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
97434b5aaa
Merged r12894 (#16091).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12895 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
4308dd7d4c
Merged r12892.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12893 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
22c7e0b8df
fix source indent of Repository::Cvs model
git-svn-id: http://svn.redmine.org/redmine/trunk@12878 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
ff46e9d0a4
Makes #watcher_link return an empty string when given nil.
git-svn-id: http://svn.redmine.org/redmine/trunk@12869 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
79d01c7fe5
Display watch link only when inside project with logged-in user (#2549).
git-svn-id: http://svn.redmine.org/redmine/trunk@12868 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
2585ed2e3b
Use spaces instead of tabs.
git-svn-id: http://svn.redmine.org/redmine/trunk@12867 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
Jean-Philippe Lang
Toshi MARUYAMA