diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 18:11:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 18:11:31 +0300 |
| commit | e6fa9529b4922a4c552e8908a2929ff995e8b53d (patch) | |
| tree | 9ccfea4d253faa8c202f753631961a794af44ad6 /app/services | |
| parent | 720cf698151643831bf36e3bd4ccd1c8e9246184 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/groups/update_service.rb | 4 | ||||
| -rw-r--r-- | app/services/incident_management/timeline_events/create_service.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index 2135892a95a..925a2acbb58 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -10,6 +10,8 @@ module Groups reject_parent_id! remove_unallowed_params + before_assignment_hook(group, params) + if renaming_group_with_container_registry_images? group.errors.add(:base, container_images_error) return false @@ -25,8 +27,6 @@ module Groups handle_changes - before_assignment_hook(group, params) - handle_namespace_settings group.assign_attributes(params) diff --git a/app/services/incident_management/timeline_events/create_service.rb b/app/services/incident_management/timeline_events/create_service.rb index c625b0d15bd..ef6f48bd741 100644 --- a/app/services/incident_management/timeline_events/create_service.rb +++ b/app/services/incident_management/timeline_events/create_service.rb @@ -52,7 +52,8 @@ module IncidentManagement def change_severity(incident, user) return if Feature.disabled?(:incident_timeline_events_for_severity, incident.project) - note = "@#{user.username} changed the incident severity to **#{incident.severity.humanize}**" + severity_label = IssuableSeverity::SEVERITY_LABELS[incident.severity.to_sym] + note = "@#{user.username} changed the incident severity to **#{severity_label}**" occurred_at = incident.updated_at action = 'severity' |