diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-26 10:59:00 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-26 10:59:00 +0200 |
| commit | 28b0208e93cbc949e1c733c60ec577740d824623 (patch) | |
| tree | 18942ada0f3e1be0d478ba2b115cfab7a745dd58 /app/controllers/import | |
| parent | 4037a738945631c5fc58c464d4a9b12e9448387a (diff) | |
| download | gitlab-ce-28b0208e93cbc949e1c733c60ec577740d824623.tar.gz | |
refactoring, mainly UI stuff to follow other import actions
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb (renamed from app/controllers/import/gitlab_project_controller.rb) | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/import/gitlab_project_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index fa3e0c7876d..c99c97893ad 100644 --- a/app/controllers/import/gitlab_project_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -1,14 +1,13 @@ -class Import::GitlabProjectController < Import::BaseController +class Import::GitlabProjectsController < Import::BaseController before_action :verify_gitlab_project_import_enabled - before_action :gitlab_project_auth, except: :callback + #before_action :gitlab_project_auth, except: :callback rescue_from OAuth::Error, with: :gitlab_project_unauthorized #TODO permissions stuff - def callback + def new - redirect_to status_import_gitlab_project_url end def status |