summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2016-12-30 11:30:25 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-18 15:19:35 -0600
commit9f0d794513d2ce1c990e61f4d21efe1dcad845fd (patch)
tree7a7b11f5ce6b42977855ef25fa87aec1a272a244 /app/controllers/projects/settings
parent61b6643eae98640a7ea73152f0e8b1cde6e27386 (diff)
downloadgitlab-ce-9f0d794513d2ce1c990e61f4d21efe1dcad845fd.tar.gz
Moved the webhooks and services gear options to a single one called integrations
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r--app/controllers/projects/settings/integrations_controller.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb
new file mode 100644
index 00000000000..07563e45865
--- /dev/null
+++ b/app/controllers/projects/settings/integrations_controller.rb
@@ -0,0 +1,18 @@
+module Projects
+ module Settings
+ class IntegrationsController < Projects::ApplicationController
+ include ServiceParams
+
+ before_action :authorize_admin_project!
+
+ layout "project_settings"
+ def show
+ @hooks = @project.hooks
+ @hook = ProjectHook.new
+
+ # Services
+ @services = @project.find_or_initialize_services
+ end
+ end
+ end
+end