diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 16:12:47 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 16:12:47 +0100 |
commit | 9c15822fc08429044db508a9e77aa0834ec0cd43 (patch) | |
tree | 2d666048ca617a619e3a7a6cb78dc9293658290a /app/controllers | |
parent | eacf8b74c5f57bd594485b9fe20e91c933d8b9bb (diff) | |
parent | 93e83afb39aa83d498fee1ebcab422b517ae6ba7 (diff) | |
download | gitlab-ce-9c15822fc08429044db508a9e77aa0834ec0cd43.tar.gz |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/service_params.rb | 1 | ||||
-rw-r--r-- | app/controllers/projects/settings/integrations_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/unicorn_test_controller.rb | 12 |
3 files changed, 14 insertions, 1 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb index a8c0937569c..be2e6c7f193 100644 --- a/app/controllers/concerns/service_params.rb +++ b/app/controllers/concerns/service_params.rb @@ -38,6 +38,7 @@ module ServiceParams :new_issue_url, :notify, :notify_only_broken_pipelines, + :notify_only_default_branch, :password, :priority, :project_key, 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 diff --git a/app/controllers/unicorn_test_controller.rb b/app/controllers/unicorn_test_controller.rb new file mode 100644 index 00000000000..b7a1a046be0 --- /dev/null +++ b/app/controllers/unicorn_test_controller.rb @@ -0,0 +1,12 @@ +if Rails.env.test? + class UnicornTestController < ActionController::Base + def pid + render plain: Process.pid.to_s + end + + def kill + Process.kill(params[:signal], Process.pid) + render plain: 'Bye!' + end + end +end |