Merge branch 'remove/user_teams' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev

1 files changed, 0 insertions, 17 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 70a4435e699..7e8d14ab10d 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -11,7 +11,6 @@ class Ability
       when "PersonalSnippet" then personal_snippet_abilities(user, subject)
       when "MergeRequest" then merge_request_abilities(user, subject)
       when "Group", "Namespace" then group_abilities(user, subject)
-      when "UserTeam" then user_team_abilities(user, subject)
       else []
       end.concat(global_abilities(user))
     end
@@ -19,7 +18,6 @@ class Ability
     def global_abilities(user)
       rules = []
       rules << :create_group if user.can_create_group
-      rules << :create_team if user.can_create_team
       rules
     end
 
@@ -146,21 +144,6 @@ class Ability
       rules.flatten
     end
 
-    def user_team_abilities user, team
-      rules = []
-
-      # Only group owner and administrators can manage team
-      if user.admin? || team.owner == user || team.admin?(user)
-        rules << [ :manage_user_team ]
-      end
-
-      if team.owner == user || user.admin?
-        rules << [ :admin_user_team ]
-      end
-
-      rules.flatten
-    end
-
     [:issue, :note, :project_snippet, :personal_snippet, :merge_request].each do |name|
       define_method "#{name}_abilities" do |user, subject|
         if subject.author == user