summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 15:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 15:08:59 +0000
commit4a14cfd1959c6a03758d0a75afe7b4277cf113ec (patch)
treecaa9aa524ee10076f94a6369227aaf566cbb6e74 /app/controllers/users_controller.rb
parentfaeb202bd4a4099d4cff5a5717915883ac51422f (diff)
downloadgitlab-ce-4a14cfd1959c6a03758d0a75afe7b4277cf113ec.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3cc07585c3f..95ea31fa977 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,6 +3,7 @@
class UsersController < ApplicationController
include RoutableActions
include RendersMemberAccess
+ include RendersProjectsList
include ControllerWithCrossProjectAccessCheck
include Gitlab::NoteableMetadata