kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'projects-controller-private' into 'master' 

Separate private methods under the keyword on projects controller

See merge request gitlab-org/gitlab-ce!31223
This commit is contained in:
Lin Jen-Shin 2019-07-29 09:37:36 +00:00
parent e2ce23267a 8476516e3d
commit 77926ea025
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/projects_controller.rb
View File

@ -284,6 +284,18 @@ class ProjectsController < Projects::ApplicationController
end
# rubocop: enable CodeReuse/ActiveRecord
def resolve
@project = Project.find(params[:id])
if can?(current_user, :read_project, @project)
redirect_to @project
else
render_404
end
end
private
# Render project landing depending of which features are available
# So if page is not available in the list it renders the next page
#
@ -453,14 +465,4 @@ class ProjectsController < Projects::ApplicationController
def present_project
@project = @project.present(current_user: current_user)
end
def resolve
@project = Project.find(params[:id])
if can?(current_user, :read_project, @project)
redirect_to @project
else
render_404
end
end
end