Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity
16,348 Commits 35 Branches 222 Tags
99375c1d34c32d6326d975d46867cedfc0447eb9
Commit Graph

63 Commits

Author SHA1 Message Date
Toshi MARUYAMA
13abe5b003 use "do end" instead of {} at ActiveRecord scope lambda of app/models/member.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@20325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-11-10 11:10:01 +00:00
Go MAEDA
907e0173e4 Update copyright year in source files to 2020 (#33069). 
git-svn-id: http://svn.redmine.org/redmine/trunk@19553 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-03-03 00:24:10 +00:00
Go MAEDA
47a71c8011 Reverts r19478 (#32897). 
git-svn-id: http://svn.redmine.org/redmine/trunk@19479 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-01-30 05:27:52 +00:00
Go MAEDA
10bb12e09f Fix 'DEPRECATION WARNING: Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1.' (#32897). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-01-28 09:49:14 +00:00
Go MAEDA
4082069c75 Update copyright year. 
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 07:36:06 +00:00
Go MAEDA
07b3087fda Enable frozen_string_literal for some files under app and lib directory (#26561). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-16 09:37:35 +00:00
Jean-Philippe Lang
b4c23f066e Display details about inheritance when editing a member roles (#31032). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17968 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 10:09:28 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561). 
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 01:32:57 +00:00
Jean-Philippe Lang
d74f0bfd5c Merged rails-5.1 branch (#23630). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-23 11:26:04 +00:00
Toshi MARUYAMA
ff257d05e3 Replace tabs with spaces (#26333). 
Patched by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16753 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-04 04:00:23 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Jean-Philippe Lang
2f77bfde91 Option to set a default assignee on each project (#482). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16525 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 08:02:06 +00:00
Toshi MARUYAMA
6139e0033a spelling fixes (#25495) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16445 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-02 03:34:44 +00:00
Jean-Philippe Lang
d171aa8398 Test broken by r16381 (#25289). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16384 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-08 21:37:13 +00:00
Jean-Philippe Lang
9c6ba66539 Adds a test for #25289. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16382 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-08 20:36:22 +00:00
Jean-Philippe Lang
109d6de0c5 Adding a principal to 2 projects with member inheritance leads to an error (#25289). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-08 20:35:11 +00:00
Jean-Philippe Lang
3c005719ae Sort user memberships by project. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16150 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 10:28:59 +00:00
Jean-Philippe Lang
d42397e9a7 Don't load Member#user, use #principal instead. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-31 13:44:41 +00:00
Jean-Philippe Lang
e22159a3cb Sort members on the DB side. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16040 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:26:08 +00:00
Jean-Philippe Lang
d3ff86b1eb Don't use add_on_empty. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15684 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-16 11:52:20 +00:00
Jean-Philippe Lang
d2f7e31951 Use .distinct instead of .uniq. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-14 07:15:13 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
0dd95cdbc5 Fixed test failure introduced by r14366. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14368 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 19:28:38 +00:00
Jean-Philippe Lang
89edc4dd39 Sort members on all their roles. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 18:43:12 +00:00
Jean-Philippe Lang
3811ff5d95 Deprecates Project#member_principals. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-18 19:12:17 +00:00
Jean-Philippe Lang
836ac7f537 Code formatting (#19982). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-06 07:22:05 +00:00
Jean-Philippe Lang
ed9f00178c Ability to limit member management to certain roles (#19707). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14293 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-31 07:16:23 +00:00
Jean-Philippe Lang
a9f052532e Fixed workflow rules when user has duplicated role by inheritance (#19569). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14179 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 17:01:23 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +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
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
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
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
Toshi MARUYAMA
3aeb85bfd5 fix typos of source comments at Member model 
git-svn-id: http://svn.redmine.org/redmine/trunk@13074 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-07 08:07:25 +00:00
Toshi MARUYAMA
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
Toshi MARUYAMA
30e3e7e0b4 Rails4: replace deprecated Relation#update_all at Member model 
git-svn-id: http://svn.redmine.org/redmine/trunk@12512 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-08 04:58:13 +00:00
Jean-Philippe Lang
5fea79504c Don't remove watchers on permission change. 
This can be far too slow (especially with membership inheritance) and notifications are not sent to watchers that are not allowed to view the item. If we still want to remove watchers that are no longer able to view the watched items, the redmine:watchers:prune task can be called periodically.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-02 13:03:22 +00:00
Jean-Philippe Lang
0f29e265fc Optionaly inherit members from parent project (#5605). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-02 12:50:45 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788). 
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 12:56:53 +00:00
Jean-Philippe Lang
d289619c75 Fixed potential error when sorting members without role (#10053). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-12 14:54:30 +00:00
Toshi MARUYAMA
aa127ebd4e Rails3: model: Member: add virtual attribute to prevent error 
On Rails 3.0, test fails with following error.

<pre>
Error:
test_validate(MemberTest):
NoMethodError: undefined method `role' for #<Member:0x7f73caf8cd08>
    app/models/member.rb:87:in `validate_role'
    test/unit/member_test.rb:76:in `test_validate'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8127 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-08 15:12:02 +00:00
Toshi MARUYAMA
15bb2fefa4 back out r8124 
r8124 shows ":roles can't be empty".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8125 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-08 13:37:27 +00:00
Toshi MARUYAMA
d9699adce5 Rails3: model: Member: errors must be set on existing attributes 
On Rails 3.0, test fails with following error.

<pre>
Error:
test_validate(MemberTest):
NoMethodError: undefined method `role' for #<Member:0x7f73caf8cd08>
    app/models/member.rb:87:in `validate_role'
    test/unit/member_test.rb:76:in `test_validate'
</pre>

Contributed by Sylvain Utard.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8124 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-08 11:13:24 +00:00
Toshi MARUYAMA
997995397e Rails3: model: replace deprecated before_destroy method at member model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8058 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-03 16:41:23 +00:00
Toshi MARUYAMA
23fd43374d Rails3: model: replace deprecated validate method at member model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-03 14:33:49 +00:00
Toshi MARUYAMA
67169fe9dd remove trailing white-spaces from app/models/member.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6503 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-21 01:54:24 +00:00
Jean-Baptiste Barth
e00884bcca Removed hard-coded english error message on failed Member creation 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3929 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-09 05:10:00 +00:00
Eric Davis
b5d9a1dfbd Refactor: Extract method to the Member model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3601 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-18 15:49:11 +00:00