5 files changed, 0 insertions, 37 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
diff --git a/app/models/user_team.rb b/app/models/deprecated/user_team.rb
index a036cedc4c7..a036cedc4c7 100644
--- a/app/models/user_team.rb
+++ b/app/models/deprecated/user_team.rb
diff --git a/app/models/user_team_project_relationship.rb b/app/models/deprecated/user_team_project_relationship.rb
index 991510be936..991510be936 100644
--- a/app/models/user_team_project_relationship.rb
+++ b/app/models/deprecated/user_team_project_relationship.rb
diff --git a/app/models/user_team_user_relationship.rb b/app/models/deprecated/user_team_user_relationship.rb
index 1f7e2625f5f..1f7e2625f5f 100644
--- a/app/models/user_team_user_relationship.rb
+++ b/app/models/deprecated/user_team_user_relationship.rb
diff --git a/app/models/user.rb b/app/models/user.rb
index 904d2919429..d8c9ac647b5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,13 +75,6 @@ class User < ActiveRecord::Base
   has_many :users_groups, dependent: :destroy
   has_many :groups, through: :users_groups
 
-  # Teams
-  has_many :own_teams,                       dependent: :destroy, class_name: "UserTeam", foreign_key: :owner_id
-  has_many :user_team_user_relationships,    dependent: :destroy
-  has_many :user_teams,                      through: :user_team_user_relationships
-  has_many :user_team_project_relationships, through: :user_teams
-  has_many :team_projects,                   through: :user_team_project_relationships
-
   # Projects
   has_many :snippets,                 dependent: :destroy, foreign_key: :author_id, class_name: "Snippet"
   has_many :users_projects,           dependent: :destroy
@@ -235,10 +228,6 @@ class User < ActiveRecord::Base
     own_groups
   end
 
-  def owned_teams
-    own_teams
-  end
-
   # Groups user has access to
   def authorized_groups
     @group_ids ||= (groups.pluck(:id) + own_groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
@@ -252,15 +241,6 @@ class User < ActiveRecord::Base
     Project.where(id: @project_ids)
   end
 
-  def authorized_teams
-    if admin?
-      UserTeam.scoped
-    else
-      @team_ids ||= (user_teams.pluck(:id) + own_teams.pluck(:id)).uniq
-      UserTeam.where(id: @team_ids)
-    end
-  end
-
   # Team membership in authorized projects
   def tm_in_authorized_projects
     UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)