diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-03 17:04:47 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-03 17:04:47 +0100 |
| commit | f29e5d4d93123ea73e5f58be46020781af2ef7cb (patch) | |
| tree | d08a8f8e5a9cf30dd4f238c187673ffe30ac39b3 /app/controllers/projects/settings/integrations_controller.rb | |
| parent | 4134d700623404948f163349882caf4a6d940cf3 (diff) | |
| parent | 8f29bf96b9306fd95b9b98019e80173b47b3a6b8 (diff) | |
| download | gitlab-ce-f29e5d4d93123ea73e5f58be46020781af2ef7cb.tar.gz | |
Merge branch 'master' into deploy-keys-load-async
Diffstat (limited to 'app/controllers/projects/settings/integrations_controller.rb')
| -rw-r--r-- | app/controllers/projects/settings/integrations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index fb2a4837735..1ff08cce8cb 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -5,7 +5,7 @@ module Projects before_action :authorize_admin_project! layout "project_settings" - + def show @hooks = @project.hooks @hook = ProjectHook.new |