summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-24 18:09:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-24 18:09:05 +0000
commitc2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch)
tree165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/controllers/projects/settings
parent51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff)
downloadgitlab-ce-c2367afbf57ebc65d5b78a743b5d6a91f0aece9f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r--app/controllers/projects/settings/integrations_controller.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb
index 0c5cf01d912..a4a53676ec7 100644
--- a/app/controllers/projects/settings/integrations_controller.rb
+++ b/app/controllers/projects/settings/integrations_controller.rb
@@ -9,10 +9,6 @@ module Projects
layout "project_settings"
def show
- @hooks = @project.hooks
- @hook = ProjectHook.new
-
- # Services
@services = @project.find_or_initialize_services(exceptions: service_exceptions)
end