Download as
Browse Code »

Commit 17a8ee57fe7a2c2b7c18c59f88828be9d5a455a0

Authored by Andrey Kumanyaev
Committed by Dmitriy Zaporozhets
1 parent a7667ffc
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove old data

Showing 3 changed files with 1 additions and 42 deletions   Show diff stats
app/controllers/admin/teams_controller.rb
  Diff comments   View file @17a8ee5
... ... @@ -60,41 +60,6 @@ class Admin::TeamsController < Admin::ApplicationController
60 60 redirect_to admin_user_teams_path, notice: 'UserTeam was successfully deleted.'
61 61 end
62 62  
63   - def delegate_projects
64   - unless params[:project_ids].blank?
65   - project_ids = params[:project_ids]
66   - access = params[:greatest_project_access]
67   - @team.assign_to_projects(project_ids, access)
68   - end
69   -
70   - redirect_to admin_team_path(@team), notice: 'Projects was successfully added.'
71   - end
72   -
73   - def relegate_project
74   - project = params[:project_id]
75   - @team.resign_from_project(project)
76   -
77   - redirect_to admin_team_path(@team), notice: 'Project was successfully removed.'
78   - end
79   -
80   - def add_members
81   - unless params[:user_ids].blank?
82   - user_ids = params[:user_ids]
83   - access = params[:default_project_access]
84   - is_admin = params[:group_admin]
85   - @team.add_members(user_ids, access, is_admin)
86   - end
87   -
88   - redirect_to admin_team_path(@team), notice: 'Members was successfully added.'
89   - end
90   -
91   - def remove_member
92   - member = params[:member_id]
93   - @team.remove_member(member)
94   -
95   - redirect_to admin_team_path(@team), notice: 'Member was successfully removed.'
96   - end
97   -
98 63 private
99 64  
100 65 def user_team
... ...
app/models/users_project.rb
  Diff comments   View file @17a8ee5
... ... @@ -41,7 +41,7 @@ class UsersProject < ActiveRecord::Base
41 41 scope :masters, where(project_access: MASTER)
42 42  
43 43 scope :in_project, ->(project) { where(project_id: project.id) }
44   - scope :in_projects, ->(projects) { where(project_id: projects.map(&:id)) }
  44 + scope :in_projects, ->(projects) { where(project_id: project_ids) }
45 45 scope :with_user, ->(user) { where(user_id: user.id) }
46 46  
47 47 class << self
... ...
config/routes.rb
  Diff comments   View file @17a8ee5
... ... @@ -70,12 +70,6 @@ Gitlab::Application.routes.draw do
70 70 end
71 71 end
72 72 resources :teams do #, constraints: { id: /[^\/]+/ } do end
73   - member do
74   - post :delegate_projects
75   - delete :relegate_project
76   - post :add_members
77   - delete :remove_member
78   - end
79 73 scope module: :teams do
80 74 resources :members, only: [:edit, :update, :destroy, :new, :create]
81 75 resources :projects, only: [:edit, :update, :destroy, :new, :create]
... ...