Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2016-12-30 20:30:25 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-19 00:19:35 +0300
commit9f0d794513d2ce1c990e61f4d21efe1dcad845fd (patch)
tree7a7b11f5ce6b42977855ef25fa87aec1a272a244 /app/controllers/projects/hooks_controller.rb
parent61b6643eae98640a7ea73152f0e8b1cde6e27386 (diff)
Moved the webhooks and services gear options to a single one called integrations
Diffstat (limited to 'app/controllers/projects/hooks_controller.rb')
-rw-r--r--app/controllers/projects/hooks_controller.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 0ae8ff98009..8c52aa748ae 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -7,8 +7,7 @@ class Projects::HooksController < Projects::ApplicationController
layout "project_settings"
def index
- @hooks = @project.hooks
- @hook = ProjectHook.new
+ redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
end
def create
@@ -16,7 +15,7 @@ class Projects::HooksController < Projects::ApplicationController
@hook.save
if @hook.valid?
- redirect_to namespace_project_hooks_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
else
@hooks = @project.hooks.select(&:persisted?)
render :index
@@ -44,7 +43,7 @@ class Projects::HooksController < Projects::ApplicationController
def destroy
hook.destroy
- redirect_to namespace_project_hooks_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
end
private