Commit f16de8ac authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 767f7d9a ae68a66a
...@@ -240,6 +240,7 @@ class Ability ...@@ -240,6 +240,7 @@ class Ability
can_manage = group_abilities(user, group).include?(:manage_group) can_manage = group_abilities(user, group).include?(:manage_group)
if can_manage && (user != target_user) if can_manage && (user != target_user)
rules << :modify rules << :modify
rules << :destroy
end end
if !group.last_owner?(user) && (can_manage || (user == target_user)) if !group.last_owner?(user) && (can_manage || (user == target_user))
rules << :destroy rules << :destroy
......
...@@ -74,7 +74,7 @@ Feature: Groups ...@@ -74,7 +74,7 @@ Feature: Groups
When I visit group "Owned" members page When I visit group "Owned" members page
Then I should see user "John Doe" in team list Then I should see user "John Doe" in team list
Then I should see user "Mary Jane" in team list Then I should see user "Mary Jane" in team list
Then I should not see the "Remove User From Group" button for "Mary Jane" Then I should not see the "Remove User From Group" button for "John Doe"
@javascript @javascript
Scenario: Guest should be able to remove himself from group Scenario: Guest should be able to remove himself from group
......
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
end end
def project_name_regex def project_name_regex
/\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
end end
def name_regex def name_regex
...@@ -49,7 +49,7 @@ module Gitlab ...@@ -49,7 +49,7 @@ module Gitlab
protected protected
def default_regex def default_regex
/\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/ /\A[.?]?[a-zA-Z0-9_][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment