diff options
| author | James Lopez <james@jameslopez.es> | 2016-08-11 17:59:37 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-08-11 17:59:37 +0300 |
| commit | 30f9596c612abc19dd060fa3a8e8ae3d92001d45 (patch) | |
| tree | 2d63a2407f4e99a22be8581194d40cebf4535d98 /app | |
| parent | 34d5426f0e17a9d0a2d2330b472114e7e457ae05 (diff) | |
Fix permissions check in controller, added relevant spec and updated docs
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index 3ec173abcdb..7d0eff37635 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -1,5 +1,6 @@ class Import::GitlabProjectsController < Import::BaseController before_action :verify_gitlab_project_import_enabled + before_action :authenticate_admin! def new @namespace_id = project_params[:namespace_id] @@ -47,4 +48,8 @@ class Import::GitlabProjectsController < Import::BaseController :path, :namespace_id, :file ) end + + def authenticate_admin! + render_404 unless current_user.is_admin? + end end diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index adcc984f506..ea4898f2107 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -77,7 +77,7 @@ = link_to "#", class: 'btn js-toggle-button import_git' do = icon('git', text: 'Repo by URL') %div{ class: 'import_gitlab_project' } - - if gitlab_project_import_enabled? + - if gitlab_project_import_enabled? && current_user.is_admin? = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do = icon('gitlab', text: 'GitLab export') |