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

cleanup namespace check now done by service

Browse source
This commit is contained in:
James Lopez 2016-06-15 09:08:33 +02:00
parent 8922712693
commit 7019a19b8c
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/import/gitlab_projects_controller.rb
View file

@ -1,6 +1,5 @@
class Import::GitlabProjectsController < Import::BaseController class Import::GitlabProjectsController < Import::BaseController
before_action :verify_gitlab_project_import_enabled before_action :verify_gitlab_project_import_enabled
before_action :verify_project_and_namespace_access
def new def new
@namespace_id = project_params[:namespace_id] @namespace_id = project_params[:namespace_id]
@ -36,16 +35,6 @@ class Import::GitlabProjectsController < Import::BaseController
project_params[:file].respond_to?(:read) project_params[:file].respond_to?(:read)
end end
def verify_project_and_namespace_access
unless namespace_access?
render_403
end
end
def namespace_access?
can?(current_user, :create_projects, Namespace.find(project_params[:namespace_id]))
end
def verify_gitlab_project_import_enabled def verify_gitlab_project_import_enabled
render_404 unless gitlab_project_import_enabled? render_404 unless gitlab_project_import_enabled?
end end