Download as
Browse Code »

Commit 0125b74b3cbdb7df3b029cd2373b96ca3905c16a

Authored by Dmitriy Zaporozhets
1 parent 71e89df5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix application crashes after #2772

Showing 2 changed files with 6 additions and 7 deletions   Show diff stats
app/controllers/admin/users_controller.rb
  Diff comments   View file @0125b74
1 1 class Admin::UsersController < Admin::ApplicationController
  2 + before_filter :admin_user, only: [:show, :edit, :update, :destroy]
  3 +
2 4 def index
3 5 @admin_users = User.scoped
4 6 @admin_users = @admin_users.filter(params[:filter])
... ... @@ -7,11 +9,8 @@ class Admin::UsersController &lt; Admin::ApplicationController
7 9 end
8 10  
9 11 def show
10   - projects = if admin_user.authorized_projects.empty?
11   - Project
12   - else
13   - Project.without_user(admin_user)
14   - end.all
  12 + @projects = Project.scoped
  13 + @projects = @projects.without_user(admin_user) if admin_user.authorized_projects.empty?
15 14 end
16 15  
17 16 def team_update
... ... @@ -102,6 +101,6 @@ class Admin::UsersController &lt; Admin::ApplicationController
102 101 protected
103 102  
104 103 def admin_user
105   - @admin_user ||= User.find_by_username(params[:id])
  104 + @admin_user ||= User.find_by_username!(params[:id])
106 105 end
107 106 end
... ...
config/routes.rb
  Diff comments   View file @0125b74
... ... @@ -49,7 +49,7 @@ Gitlab::Application.routes.draw do
49 49 # Admin Area
50 50 #
51 51 namespace :admin do
52   - resources :users do
  52 + resources :users, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do
53 53 member do
54 54 put :team_update
55 55 put :block
... ...