diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-03 11:45:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-03 11:45:01 +0000 |
| commit | 8c5701b622a12ebc79a88e65baaf29549c5be1da (patch) | |
| tree | e29cb2579b1e8f4930b9132d8020879ef3b64851 /app/controllers | |
| parent | 71fe23c1bf7ec0cc875db3caf4f4046aa5f32c0f (diff) | |
| parent | a09e1d3dda57323d8932b498a711928c98404005 (diff) | |
| download | gitlab-ce-8c5701b622a12ebc79a88e65baaf29549c5be1da.tar.gz | |
Merge branch 'fix/import-export-admin' into 'master'
Enable Import/Export for non-admin users
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315
Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/
See merge request !6080
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index 7d0eff37635..3ec173abcdb 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -1,6 +1,5 @@ class Import::GitlabProjectsController < Import::BaseController before_action :verify_gitlab_project_import_enabled - before_action :authenticate_admin! def new @namespace_id = project_params[:namespace_id] @@ -48,8 +47,4 @@ class Import::GitlabProjectsController < Import::BaseController :path, :namespace_id, :file ) end - - def authenticate_admin! - render_404 unless current_user.is_admin? - end end |