diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-06 17:27:12 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-06 17:27:12 +0100 |
| commit | e5183d907e9db2bdf87dae83708b35a970a829ba (patch) | |
| tree | edc05f30dd515cbe7ef3966a2b7aab7e835c4286 /app/controllers/projects/triggers_controller.rb | |
| parent | c85df8105e3b8982ecf6a16f8ae9f3af2f130030 (diff) | |
| parent | e1a64f0c6d769c38918c50fdbd9b72b0f6fcfa4a (diff) | |
| download | gitlab-ce-e5183d907e9db2bdf87dae83708b35a970a829ba.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/controllers/projects/triggers_controller.rb')
| -rw-r--r-- | app/controllers/projects/triggers_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb index e86adddd77f..a5b17fa65ea 100644 --- a/app/controllers/projects/triggers_controller.rb +++ b/app/controllers/projects/triggers_controller.rb @@ -7,7 +7,7 @@ class Projects::TriggersController < Projects::ApplicationController layout 'project_settings' def index - redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) + redirect_to project_settings_ci_cd_path(@project) end def create @@ -19,7 +19,7 @@ class Projects::TriggersController < Projects::ApplicationController flash[:alert] = 'You could not create a new trigger.' end - redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) + redirect_to project_settings_ci_cd_path(@project) end def take_ownership @@ -29,7 +29,7 @@ class Projects::TriggersController < Projects::ApplicationController flash[:alert] = 'You could not take ownership of trigger.' end - redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) + redirect_to project_settings_ci_cd_path(@project) end def edit @@ -37,7 +37,7 @@ class Projects::TriggersController < Projects::ApplicationController def update if trigger.update(trigger_params) - redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project), notice: 'Trigger was successfully updated.' + redirect_to project_settings_ci_cd_path(@project), notice: 'Trigger was successfully updated.' else render action: "edit" end @@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController flash[:alert] = "Could not remove the trigger." end - redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project), status: 302 + redirect_to project_settings_ci_cd_path(@project), status: 302 end private |