diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 21:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 21:08:49 +0000 |
commit | cf1d4237a4f226ba2deed26240544da0675a41e5 (patch) | |
tree | 926a71b9279659bc52db0187b463603934718bf2 /app/controllers/projects/settings | |
parent | 0ac82f99553ce12009970a14c0afc02d1f6515bb (diff) | |
download | gitlab-ce-cf1d4237a4f226ba2deed26240544da0675a41e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index 3817da8596b..12b4f9ac56c 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -19,19 +19,36 @@ module Projects # overridden in EE def track_events(result) + if result[:status] == :success + ::Gitlab::Tracking::IncidentManagement.track_from_params( + update_params[:incident_management_setting_attributes] + ) + end end private - # overridden in EE def render_update_response(result) respond_to do |format| + format.html do + render_update_html_response(result) + end + format.json do render_update_json_response(result) end end end + def render_update_html_response(result) + if result[:status] == :success + flash[:notice] = _('Your changes have been saved') + redirect_to project_settings_operations_path(@project) + else + render 'show' + end + end + def render_update_json_response(result) if result[:status] == :success flash[:notice] = _('Your changes have been saved') @@ -61,6 +78,8 @@ module Projects # overridden in EE def permitted_project_params project_params = { + incident_management_setting_attributes: ::Gitlab::Tracking::IncidentManagement.tracking_keys.keys, + metrics_setting_attributes: [:external_dashboard_url], error_tracking_setting_attributes: [ |