meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 07:21:12 +00:00
Code Issues Releases Wiki Activity
11,280 Commits 32 Branches 194 Tags
Commit Graph

1980 Commits

Author SHA1 Message Date
Jean-Philippe Lang
d62574badb Code cleanup, use safer #closed? 
git-svn-id: http://svn.redmine.org/redmine/trunk@13505 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 21:40:26 +00:00
Jean-Philippe Lang
67c4936908 Restores commits reverted when rails-4.1 branch was merged (#18174). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@13504 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 18:41:35 +00:00
Toshi MARUYAMA
6f92548b38 remove unneeded "references" of joins 
"references" is needed for includes, but not needed for joins.

git-svn-id: http://svn.redmine.org/redmine/trunk@13501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:18:45 +00:00
Toshi MARUYAMA
374f4dd52e use includes instead of joins at Issue#visible 
"rake test" passes all test, but following test fails on command line.

<pre>
$ ruby test/unit/issue_test.rb -n test_visible_scope_for_member_with_groups_should_return_assigned_issues

  1) Failure:
IssueTest#test_visible_scope_for_member_with_groups_should_return_assigned_issues [test/unit/issue_test.rb:321]:
Failed assertion, no message given.
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:18:28 +00:00
Jean-Philippe Lang
c2e73160da Adds a single controller for users and groups memberships and support for adding multiple projects at once (#11702). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13498 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 21:46:40 +00:00
Jean-Philippe Lang
ca5946d82e Code cleanup: use #project_condition. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13497 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 17:23:02 +00:00
Jean-Philippe Lang
41d81a09b3 Use regular AR query instead of raw SQL. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13496 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 17:22:32 +00:00
Jean-Philippe Lang
94a491e0ca Replaced Board#topics with a regular method. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13491 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 19:40:55 +00:00
Jean-Philippe Lang
116eb8bcc7 Fixed an SQL error with SQLServer (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13490 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 19:34:00 +00:00
Jean-Philippe Lang
360895068e Code cleanup, use array instead of handcrafted update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13485 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:51:00 +00:00
Jean-Philippe Lang
498a34403a Removed unneeded :foreign_key option on belongs_to associations. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13484 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:41:03 +00:00
Jean-Philippe Lang
0fc1906201 Removed deprecated stuff for Redmine 3.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13483 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:28:33 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +00:00
Jean-Philippe Lang
b01c740980 Fixed test failure with MySQL introduced by r13467. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:44:33 +00:00
Jean-Philippe Lang
51508f67d0 Fixed test failure with SQLServer introduced by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13467 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 17:47:18 +00:00
Jean-Philippe Lang
78120536b1 Fixed tests broken by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13466 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:47:43 +00:00
Jean-Philippe Lang
cac6ebb6c5 Code cleanup, removed raw SQL queries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13461 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 19:16:09 +00:00
Toshi MARUYAMA
92f2ab6b70 use deep_dup to prevent losing mail receiving options (#14491) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13457 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 04:04:38 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:59:21 +00:00
Jean-Philippe Lang
a567546335 Don't link multiple changesets from the same commit multiple times (#17931). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13427 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 12:10:33 +00:00
Jean-Philippe Lang
15d5c331eb Let the new time_entry form be submitted without project (#17954). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:23:14 +00:00
Jean-Philippe Lang
7e7ac5340a Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-28 14:51:08 +00:00
Jean-Philippe Lang
8ae41b4846 Ignore email keywords after truncation line (#8758). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-20 07:51:37 +00:00
Jean-Baptiste Barth
b519aba63e Expire other sessions on password change (#17796). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 21:38:54 +00:00
Toshi MARUYAMA
5a96012ad0 remove trailing white-space from app/models/issue_custom_field.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 02:54:12 +00:00
Jean-Philippe Lang
5ccbe10d10 Code cleanup (#17717). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 11:38:52 +00:00
Jean-Philippe Lang
51db15ac61 Parent issue autocomplete does not follow to the "Allow cross-project subtasks" setting (#14281). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 10:42:31 +00:00
Jean-Baptiste Barth
2eb95f41b4 Invalidate security tokens on password or email changes (#17717). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 08:22:25 +00:00
Jean-Philippe Lang
e124da5488 Fixed: Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163). 
Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 10:17:15 +00:00
Jean-Baptiste Barth
d00f875800 Make 2nd parameter optional in User#allowed_to_globally? for consistency (#6498). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13364 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-06 03:39:52 +00:00
Jean-Baptiste Barth
c190496f24 Fix syntax for ruby 1.8.7 (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:36:06 +00:00
Jean-Baptiste Barth
ad9a35c6b9 Optimize committers/users map retrieval for statistic graphs (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:23:48 +00:00
Jean-Baptiste Barth
8c945fb791 Honnor committers/users mapping in repository statistics (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 17:32:01 +00:00
Jean-Baptiste Barth
41bf39df36 Move some RepositoriesController logic to Repository#stats_by_author (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13351 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 13:58:58 +00:00
Toshi MARUYAMA
64255dc663 remove unneeded setting self[left_column_name] and self[right_column_name] from Issue#update_nested_set_attributes_on_parent_change (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13345 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-23 05:45:49 +00:00
Jean-Philippe Lang
efc05bc73c Add time entries custom fields to the context menu for quick bulk edit (#17484). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:52:27 +00:00
Jean-Philippe Lang
41e7210210 Fixed an error when member's project is nil (#17486). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:49:53 +00:00
Jean-Philippe Lang
2a4fdf6755 WARNING: Can't mass-assign protected attributes: user_id, type. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:21:17 +00:00
Jean-Philippe Lang
9f7901e364 Fixed that query roles are not copied when copying a project (#17202). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:20:44 +00:00
Jean-Philippe Lang
2e04614e21 Don't prepend project name if the version is not shared. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 11:26:29 +00:00
Toshi MARUYAMA
d29799712f remove unneeded statement from Issue#parent_issue_id= 
git-svn-id: http://svn.redmine.org/redmine/trunk@13303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-13 00:04:23 +00:00
Toshi MARUYAMA
c2e75254b7 remove trailing white-spaces from app/models/user.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-11 08:04:52 +00:00
Toshi MARUYAMA
1b01a7ab5e remove trailing white-space from app/models/workflow_permission.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-03 23:03:39 +00:00
Toshi MARUYAMA
45a744d77d use \A instead of ^ for RegExp (#16190) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:33 +00:00
Toshi MARUYAMA
4b55bb913c only ignore undesirable Auto-Submitted headers defined in RFC3834 (#16190) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13206 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:18 +00:00
Toshi MARUYAMA
d0c741c88c remove redundant empty lines from app/models/auth_source_ldap.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 14:37:56 +00:00
Toshi MARUYAMA
5368af4847 replace tabs to spaces (#16795) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:15:43 +00:00
Jean-Philippe Lang
1fd5346c3c Fixed that Member#destroy triggers after_destroy callbacks twice (#16795). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 09:55:39 +00:00
Jean-Baptiste Barth
1914d1a159 Improve performance of Principal.member_of scope 
The 'join' turns to be slow for large numbers of members (>20k). Using a
sub-query like in Principal.not_member_of is more efficient and performance
is the same for smaller values.


git-svn-id: http://svn.redmine.org/redmine/trunk@13139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-19 21:17:55 +00:00
Toshi MARUYAMA
a87cc86b99 fix typo of app/models/repository/mercurial.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13129 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-03 23:21:01 +00:00