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

app/controllers/admin/teams/application_controller.rb

-# Provides a base class for Admin controllers to subclass
-#
-# Automatically sets the layout and ensures an administrator is logged in
-class Admin::Teams::ApplicationController < Admin::ApplicationController
-
-  private
-
-  def user_team
-    @team = UserTeam.find_by_path(params[:team_id])
-  end
-end

app/controllers/admin/teams/members_controller.rb

-class Admin::Teams::MembersController < Admin::Teams::ApplicationController
-  def new
-    @users = User.potential_team_members(user_team)
-  end
-
-  def create
-    unless params[:user_ids].blank?
-      user_ids = params[:user_ids]
-      access = params[:default_project_access]
-      is_admin = params[:group_admin]
-      user_team.add_members(user_ids, access, is_admin)
-    end
-
-    redirect_to admin_team_path(user_team), notice: 'Members were successfully added into Team of users.'
-  end
-
-  def edit
-    team_member
-  end
-
-  def update
-    options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]}
-    if user_team.update_membership(team_member, options)
-      redirect_to admin_team_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
-    else
-      render :edit
-    end
-  end
-
-  def destroy
-    user_team.remove_member(team_member)
-    redirect_to admin_team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
-  end
-
-  protected
-
-  def team_member
-    @member ||= user_team.members.find_by_username(params[:id])
-  end
-end

app/controllers/admin/teams/projects_controller.rb

-class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
-  def new
-    @projects = Project.scoped
-    @projects = @projects.without_team(user_team) if user_team.projects.any?
-    #@projects.reject!(&:empty_repo?)
-  end
-
-  def create
-    unless params[:project_ids].blank?
-      project_ids = params[:project_ids]
-      access = params[:greatest_project_access]
-      user_team.assign_to_projects(project_ids, access)
-    end
-
-    redirect_to admin_team_path(user_team), notice: 'Team of users was successfully assgned to projects.'
-  end
-
-  def edit
-    team_project
-  end
-
-  def update
-    if user_team.update_project_access(team_project, params[:greatest_project_access])
-      redirect_to admin_team_path(user_team), notice: 'Access was successfully updated.'
-    else
-      render :edit
-    end
-  end
-
-  def destroy
-    user_team.resign_from_project(team_project)
-    redirect_to admin_team_path(user_team), notice: 'Team of users was successfully reassigned from project.'
-  end
-
-  protected
-
-  def team_project
-    @project ||= user_team.projects.find_with_namespace(params[:id])
-  end
-
-end

app/controllers/admin/teams_controller.rb

-class Admin::TeamsController < Admin::ApplicationController
-  def index
-    @teams = UserTeam.order('name ASC')
-    @teams = @teams.search(params[:name]) if params[:name].present?
-    @teams = @teams.page(params[:page]).per(20)
-  end
-
-  def show
-    user_team
-  end
-
-  def new
-    @team = UserTeam.new
-  end
-
-  def edit
-    user_team
-  end
-
-  def create
-    @team = UserTeam.new(params[:user_team])
-    @team.path = @team.name.dup.parameterize if @team.name
-    @team.owner = current_user
-
-    if @team.save
-      redirect_to admin_team_path(@team), notice: 'Team of users was successfully created.'
-    else
-      render action: "new"
-    end
-  end
-
-  def update
-    user_team_params = params[:user_team].dup
-    owner_id = user_team_params.delete(:owner_id)
-
-    if owner_id
-      user_team.owner = User.find(owner_id)
-    end
-
-    if user_team.update_attributes(user_team_params)
-      redirect_to admin_team_path(user_team), notice: 'Team of users was successfully updated.'
-    else
-      render action: "edit"
-    end
-  end
-
-  def destroy
-    user_team.destroy
-
-    redirect_to admin_teams_path, notice: 'Team of users was successfully deleted.'
-  end
-
-  protected
-
-  def user_team
-    @team ||= UserTeam.find_by_path(params[:id])
-  end
-
-end

app/controllers/dashboard_controller.rb

@@ -7,7 +7,6 @@ class DashboardController < ApplicationController
   def show
     @groups = current_user.authorized_groups.sort_by(&:human_name)
     @has_authorized_projects = @projects.count > 0
-    @teams = current_user.authorized_teams
     @projects_count = @projects.count
     @projects = @projects.limit(20)

app/controllers/projects/teams_controller.rb

-class Projects::TeamsController < Projects::ApplicationController
-
-  before_filter :authorize_admin_team_member!
-
-  def available
-    @teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
-    @teams = @teams.without_project(project)
-    unless @teams.any?
-      redirect_to project_team_index_path(project), notice: "No available teams for assigment."
-    end
-  end
-
-  def assign
-    unless params[:team_id].blank?
-      team = UserTeam.find(params[:team_id])
-      access = params[:greatest_project_access]
-      team.assign_to_project(project, access)
-    end
-    redirect_to project_team_index_path(project)
-  end
-
-  def resign
-    team = project.user_teams.find_by_path(params[:id])
-    team.resign_from_project(project)
-
-    redirect_to project_team_index_path(project)
-  end
-
-  protected
-
-  def user_team
-    @team ||= UserTeam.find_by_path(params[:id])
-  end
-end

app/controllers/team_members_controller.rb

@@ -6,7 +6,6 @@ class TeamMembersController < ProjectResourceController
   def index
     @group = @project.group
     @users_projects = @project.users_projects.order('project_access DESC')
-    @assigned_teams = @project.user_team_project_relationships
   end
   def new

app/controllers/teams/application_controller.rb

-class Teams::ApplicationController < ApplicationController
-
-  layout 'user_team'
-
-  before_filter :authorize_manage_user_team!
-
-  protected
-
-  def user_team
-    @team ||= UserTeam.find_by_path(params[:team_id])
-  end
-
-end

app/controllers/teams/members_controller.rb

-class Teams::MembersController < Teams::ApplicationController
-
-  skip_before_filter :authorize_manage_user_team!, only: [:index]
-
-  def index
-    @members = user_team.members
-  end
-
-  def new
-    @users = User.potential_team_members(user_team)
-  end
-
-  def create
-    unless params[:user_ids].blank?
-      user_ids = params[:user_ids].split(',')
-      access = params[:default_project_access]
-      is_admin = params[:group_admin]
-      user_team.add_members(user_ids, access, is_admin)
-    end
-
-    redirect_to team_members_path(user_team), notice: 'Members were successfully added into Team of users.'
-  end
-
-  def edit
-    team_member
-  end
-
-  def update
-    member_params = params[:team_member]
-
-    options = {
-      default_projects_access: member_params[:permission],
-      group_admin: member_params[:group_admin]
-    }
-
-    if user_team.update_membership(team_member, options)
-      redirect_to team_members_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
-    else
-      render :edit
-    end
-  end
-
-  def destroy
-    user_team.remove_member(team_member)
-    redirect_to team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
-  end
-
-  protected
-
-  def team_member
-    @member ||= user_team.members.find_by_username(params[:id])
-  end
-end

app/controllers/teams/projects_controller.rb

-class Teams::ProjectsController < Teams::ApplicationController
-  def create
-    redirect_to :back if params[:project_ids].blank?
-
-    project_ids = params[:project_ids]
-    access = params[:greatest_project_access]
-
-    # Reject non-allowed projects
-    allowed_project_ids = current_user.owned_projects.map(&:id)
-    project_ids.select! { |id| allowed_project_ids.include?(id.to_i) }
-
-    # Assign projects to team
-    user_team.assign_to_projects(project_ids, access)
-
-    redirect_to edit_team_path(user_team), notice: 'Team of users was successfully assigned to projects.'
-  end
-
-  def edit
-    team_project
-  end
-
-  def update
-    if user_team.update_project_access(team_project, params[:greatest_project_access])
-      redirect_to edit_team_path(user_team), notice: 'Access was successfully updated.'
-    else
-      render :edit
-    end
-  end
-
-  def destroy
-    user_team.resign_from_project(team_project)
-    redirect_to team_projects_path(user_team), notice: 'Team of users was successfully reassigned from project.'
-  end
-
-  private
-
-  def team_project
-    @project ||= user_team.projects.find_with_namespace(params[:id])
-  end
-end

app/controllers/teams_controller.rb

-class TeamsController < ApplicationController
-  # Authorize
-  before_filter :authorize_create_team!, only: [:new, :create]
-  before_filter :authorize_manage_user_team!, only: [:edit, :update]
-  before_filter :authorize_admin_user_team!, only: [:destroy]
-
-  before_filter :user_team, except: [:new, :create]
-
-  layout :determine_layout
-
-  before_filter :set_title, only: [:new, :create]
-
-  def show
-    projects
-    @events = Event.in_projects(user_team.project_ids).limit(20).offset(params[:offset] || 0)
-  end
-
-  def edit
-    projects
-    @avaliable_projects = current_user.owned_projects.without_team(user_team)
-  end
-
-  def update
-    if user_team.update_attributes(params[:user_team])
-      redirect_to team_path(user_team)
-    else
-      render action: :edit
-    end
-  end
-
-  def destroy
-    user_team.destroy
-    redirect_to dashboard_path
-  end
-
-  def new
-    @team = UserTeam.new
-  end
-
-  def create
-    @team = UserTeam.new(params[:user_team])
-    @team.owner = current_user unless params[:owner]
-    @team.path = @team.name.dup.parameterize if @team.name
-
-    if @team.save
-      # Add current user as Master to the team
-      @team.add_members([current_user.id], UsersProject::MASTER, true)
-
-      redirect_to team_path(@team)
-    else
-      render action: :new
-    end
-  end
-
-  # Get authored or assigned open merge requests
-  def merge_requests
-    projects
-    @merge_requests = MergeRequest.of_user_team(user_team)
-    @merge_requests = FilterContext.new(@merge_requests, params).execute
-    @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
-  end
-
-  # Get only assigned issues
-  def issues
-    projects
-    @issues = Issue.of_user_team(user_team)
-    @issues = FilterContext.new(@issues, params).execute
-    @issues = @issues.recent.page(params[:page]).per(20)
-    @issues = @issues.includes(:author, :project)
-  end
-
-  protected
-
-  def projects
-    @projects ||= user_team.projects.sorted_by_activity
-  end
-
-  def user_team
-    @team ||= current_user.authorized_teams.find_by_path(params[:id])
-  end
-
-  def set_title
-    @title = 'New Team'
-  end
-
-  def determine_layout
-    if [:new, :create].include?(action_name.to_sym)
-      'navless'
-    else
-      'user_team'
-    end
-  end
-end

app/helpers/application_helper.rb

@@ -92,7 +92,6 @@ module ApplicationHelper
   def search_autocomplete_source
     projects = current_user.authorized_projects.map { |p| { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } }
     groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } }
-    teams = current_user.authorized_teams.map { |team| { label: "team: #{simple_sanitize(team.name)}", url: team_path(team) } }
     default_nav = [
       { label: "My Profile", url: profile_path },
@@ -128,7 +127,7 @@ module ApplicationHelper
       ]
     end
-    [groups, teams, projects, default_nav, project_nav, help_nav].flatten.to_json
+    [groups, projects, default_nav, project_nav, help_nav].flatten.to_json
   end
   def emoji_autocomplete_source

app/helpers/user_teams_helper.rb

-module UserTeamsHelper
-  def team_filter_path(entity, options={})
-    exist_opts = {
-      status: params[:status],
-      project_id: params[:project_id],
-    }
-
-    options = exist_opts.merge(options)
-
-    case entity
-    when 'issue' then
-      issues_team_path(@team, options)
-    when 'merge_request'
-      merge_requests_team_path(@team, options)
-    end
-  end
-
-  def grouped_user_team_members(team)
-    team.user_team_user_relationships.sort_by(&:permission).reverse.group_by(&:permission)
-  end
-
-  def remove_from_user_team_message(team, member)
-    "You are going to remove #{member.name} from #{team.name}. Are you sure?"
-  end
-end

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

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)

app/views/admin/dashboard/index.html.haml

@@ -49,10 +49,6 @@
   .span4
     %h4 Stats
     %hr
-    %p
-      Teams
-      %span.light.pull-right
-        = UserTeam.count
     %p
       Forks
       %span.light.pull-right

app/views/admin/teams/edit.html.haml

-%h3.page_title Edit Team
-%hr
-= form_for @team, url: admin_team_path(@team), method: :put do |f|
-  - if @team.errors.any?
-    .alert.alert-error
-      %span= @team.errors.full_messages.first
-  .clearfix.team_name_holder
-    = f.label :name do
-      Team name is
-    .input
-      = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
-
-  .clearfix.team-description-holder
-    = f.label :description, "Details"
-    .input
-      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
-
-  .clearfix.team_name_holder
-    = f.label :path do
-      %span.cred Team path is
-    .input
-      = f.text_field :path, placeholder: "example-team", class: "xxlarge danger"
-      %ul.cred
-        %li It will change web url for access team and team projects.
-
-  .form-actions
-    = f.submit 'Edit team', class: "btn btn-remove"
-    = link_to  'Cancel', admin_teams_path, class: "btn btn-cancel"