65c9223fe5
Merged r12990 ( #16338 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-29 14:37:17 +00:00
c61a6a707f
Merged r12971 ( #16255 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-17 08:30:30 +00:00
9cb17f598d
Merged r12938 ( #16169 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12939 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-28 11:39:01 +00:00
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
2014-02-25 06:53:35 +00:00
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
2014-02-25 06:49:53 +00:00
63212e5c16
Merged r12915 to 12918 ( #16107 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:20:42 +00:00
88b3872179
Merged r12914 ( #16134 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12922 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:15:37 +00:00
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
2014-02-23 08:14:59 +00:00
805debddd0
Merged r12910 and r12911 ( #16091 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:11:59 +00:00
97434b5aaa
Merged r12894 ( #16091 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-15 09:01:16 +00:00
22c7e0b8df
fix source indent of Repository::Cvs model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12878 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-13 07:13:59 +00:00
2585ed2e3b
Use spaces instead of tabs.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12867 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 11:58:19 +00:00
1ad33134d3
Enable the watching of news ( #2549 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 11:54:21 +00:00
171581da7e
Project.activities should always return a ActiveRecord::Relation ( #15983 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:36:49 +00:00
09b95905dc
Make sure that Repository#extra_info returns a Hash or nil ( #16032 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 20:23:06 +00:00
a0baf7ee5d
fix wrong issue 'assigned-to-my-group' css class ( #16038 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 12:16:27 +00:00
b87a7b8984
scm: mercurial: insert long id to DB unless existing id in DB is not short id ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 14:53:16 +00:00
d301b8c0c1
scm: mercurial: switch short or long id of entry by existing value in DB ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 04:44:20 +00:00
eb18660369
scm: mercurial: override entry and scm_entries ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 04:44:04 +00:00
8a35585bd2
scm: mercurial: add method to switch short or long id by existing value in DB ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 00:41:16 +00:00
d45bf0a83e
scm: split Repository#entries ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 00:40:59 +00:00
f2ec6f8d77
back out r12752 ( #14361 )
...
Revision, Author and Comment of repository browser are broken.
git-svn-id: http://svn.redmine.org/redmine/trunk@12753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 08:46:47 +00:00
ae68ff1100
scm: mercurial: use long id in adapter level ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 07:47:04 +00:00
6ea2b7a43b
scm: mercurial: split Repository::Mercurial#latest_changesets_cond for short and long id ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12751 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 07:46:45 +00:00
5dcecec1bd
scm: mercurial: use 12 chars id for format_changeset_identifier ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 04:23:53 +00:00
888823a449
Fixed calculation of done_ratio of parent task with child having estimated_time at 0 ( #15870 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-31 17:42:46 +00:00
619857e1a4
remove unneeded Relation#all from Repository::Git model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-31 10:15:52 +00:00
8574948617
code format clean up Repository::Git model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12742 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-31 10:15:37 +00:00
d5a9af54fa
Reverts r12669 and add a test for #15870 .
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-30 22:18:07 +00:00
35cc911192
update copyright year ( #15977 )
...
Contributed by Daniel Felix.
git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
a711cbb44e
back out from r12715 to r12720: #connection replacing
...
These revisions have performance regression on Rails 3.2.16.
git-svn-id: http://svn.redmine.org/redmine/trunk@12735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 07:21:47 +00:00
4f996fa5c2
remove unneeded Relation#all from TimeEntryQuery model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12732 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:19:20 +00:00
ea8febad03
remove unneeded Relation#all from Principal model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12731 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:19:03 +00:00
8832cca13b
remove unneeded Relation#all from Repository::Subversion model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12730 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:18:47 +00:00
b6f066ddf3
remove unneeded Relation#all from Project model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12729 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:18:30 +00:00
051ed3557b
remove unneeded Relation#all from MemberRole model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:18:13 +00:00
3b3a7c50a9
remove unneeded Relation#all from Journal model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:17:57 +00:00
c489c28219
code format cleanup Repository::Subversion model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:42:31 +00:00
2bdf28262b
remove unneeded Relation#all from IssueStatus model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12725 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:24:41 +00:00
9c7568c1a1
remove unneeded Relation#all from IssueQuery model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12724 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:09:24 +00:00
ea8e5c74ec
remove unneeded Relation#all from Mailer model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:09:09 +00:00
ca3d706f56
remove unneeded Relation#all from IssuePriority model
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12722 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:08:54 +00:00
dff2721fbe
Rails4: replace deprecated #connection from Query model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12720 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:08:25 +00:00
f5c5393d09
Rails4: replace deprecated #connection from Project model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12719 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:08:09 +00:00
b1d0107ac0
Rails4: replace deprecated #connection from Repository model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12718 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:07:52 +00:00
6be972af35
Rails4: replace deprecated #connection from IssueQuery model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12717 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:07:34 +00:00
ecf27b3f12
Rails4: replace deprecated #connection from IssueCustomField model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12716 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:07:17 +00:00
0daa1a1a4f
Rails4: replace deprecated #connection from Issue model
...
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class.
git-svn-id: http://svn.redmine.org/redmine/trunk@12715 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:06:58 +00:00
e391be4086
Adds settings for disabling browser language detection and language preference ( #2691 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-24 10:28:12 +00:00
6e6c6fac5c
Adds firstname initials+lastname user format.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-24 09:23:11 +00:00
Jean-Philippe Lang
Toshi MARUYAMA