diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-03 11:41:15 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-06 09:47:44 -0600 |
| commit | 55b07533a9bede54728be91f97678a67f431c6b5 (patch) | |
| tree | 250c59b0562c4244b21aa8e0b3b4c90aaf463eff | |
| parent | b17843a95471112bfdecdff2b4c905ab720f8ed0 (diff) | |
| download | gitlab-ce-55b07533a9bede54728be91f97678a67f431c6b5.tar.gz | |
Renamed the redirect_request concern to repository_settings_redirect
Also fixed naming of a test in the deploy_keys_presenter
| -rw-r--r-- | app/controllers/concerns/repository_settings_redirect.rb (renamed from app/controllers/concerns/redirect_request.rb) | 2 | ||||
| -rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 2 | ||||
| -rw-r--r-- | spec/presenters/projects/settings/deploy_keys_presenter_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/concerns/redirect_request.rb b/app/controllers/concerns/repository_settings_redirect.rb index acab5a8446a..0854c73a02f 100644 --- a/app/controllers/concerns/redirect_request.rb +++ b/app/controllers/concerns/repository_settings_redirect.rb @@ -1,4 +1,4 @@ -module RedirectRequest +module RepositorySettingsRedirect extend ActiveSupport::Concern def redirect_to_repository_settings(project) diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index 465757e07b1..1502b734f37 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -1,5 +1,5 @@ class Projects::DeployKeysController < Projects::ApplicationController - include RedirectRequest + include RepositorySettingsRedirect respond_to :html # Authorize diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index b7817a71e0d..a8cb07eb67a 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -1,5 +1,5 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController - include RedirectRequest + include RepositorySettingsRedirect # Authorize before_action :require_non_empty_project before_action :authorize_admin_project! diff --git a/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb b/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb index 8faaaf55d72..7245631a388 100644 --- a/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb +++ b/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb @@ -44,7 +44,7 @@ describe Projects::Settings::DeployKeysPresenter do expect(presenter.available_project_keys).to be_empty end - it 'returns if any available_project_keys are enabled' do + it 'returns false if any available_project_keys are enabled' do expect(presenter.any_available_project_keys_enabled?).to eq(false) end |