diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-02 18:05:06 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-14 13:18:14 +0200 |
| commit | 515205d3c1c6655302ed0ae44cc5954dead7ae79 (patch) | |
| tree | 5ac24884eb0e6faf56e1e460260303fbdb14b9cf /app/models/group.rb | |
| parent | 6d103a2f4764441b1650ba6d790732056c9a8516 (diff) | |
| download | gitlab-ce-515205d3c1c6655302ed0ae44cc5954dead7ae79.tar.gz | |
UI and copywriting improvements13948-access-request-to-projects-and-groups
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 520cbd0283c..b8dffe9f5b9 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -8,7 +8,7 @@ class Group < Namespace has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember' alias_method :members, :group_members - has_many :users, through: :group_members + has_many :users, -> { where(members: { requested_at: nil }) }, through: :group_members has_many :project_group_links, dependent: :destroy has_many :shared_projects, through: :project_group_links, source: :project has_many :notification_settings, dependent: :destroy, as: :source |