Commit a7c77ef7 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab master

parents dd5054d7 0f5d90d2
...@@ -36,7 +36,7 @@ module Projects ...@@ -36,7 +36,7 @@ module Projects
override :alert_source override :alert_source
def alert_source def alert_source
alert.monitoring_tool || integration&.name || 'Generic Alert Endpoint' super || integration&.name || 'Generic Alert Endpoint'
end end
def active_integration? def active_integration?
......
...@@ -73,7 +73,7 @@ module SystemNotes ...@@ -73,7 +73,7 @@ module SystemNotes
# #
# Returns the created Note object # Returns the created Note object
def log_resolving_alert(monitoring_tool) def log_resolving_alert(monitoring_tool)
body = "logged a resolving alert from **#{monitoring_tool}**" body = "logged a recovery alert from **#{monitoring_tool}**"
create_note(NoteSummary.new(noteable, project, User.alert_bot, body, action: 'new_alert_added')) create_note(NoteSummary.new(noteable, project, User.alert_bot, body, action: 'new_alert_added'))
end end
......
---
title: Update resolving alert system notes to use term Recovery Alert
merge_request: 58513
author:
type: changed
...@@ -35,7 +35,8 @@ You can view the Container Registry for a project or group. ...@@ -35,7 +35,8 @@ You can view the Container Registry for a project or group.
1. Go to your project or group. 1. Go to your project or group.
1. Go to **Packages & Registries > Container Registry**. 1. Go to **Packages & Registries > Container Registry**.
You can search, sort, filter, and [delete](#delete-images-from-within-gitlab) containers on this page. You can search, sort, filter, and [delete](#delete-images-from-within-gitlab)
containers on this page. You can share a filtered view by copying the URL from your browser.
Only members of the project or group can access a private project's Container Registry. Only members of the project or group can access a private project's Container Registry.
......
...@@ -19,7 +19,8 @@ You can view packages for your project or group. ...@@ -19,7 +19,8 @@ You can view packages for your project or group.
1. Go to the project or group. 1. Go to the project or group.
1. Go to **Packages & Registries > Package Registry**. 1. Go to **Packages & Registries > Package Registry**.
You can search, sort, and filter packages on this page. You can search, sort, and filter packages on this page. You can share your search results by copying
and pasting the URL from your browser.
You can also find helpful code snippets for configuring your package manager or installing a given package. You can also find helpful code snippets for configuring your package manager or installing a given package.
......
...@@ -145,7 +145,7 @@ To seamlessly navigate among commits in a merge request: ...@@ -145,7 +145,7 @@ To seamlessly navigate among commits in a merge request:
1. Select a commit to open it in the single-commit view. 1. Select a commit to open it in the single-commit view.
1. Navigate through the commits by either: 1. Navigate through the commits by either:
- Selecting **Prev** and **Next** buttons right beneath the tab buttons. - Selecting **Prev** and **Next** buttons below the tab buttons.
- Using the <kbd>X</kbd> and <kbd>C</kbd> keyboard shortcuts. - Using the <kbd>X</kbd> and <kbd>C</kbd> keyboard shortcuts.
![Merge requests commit navigation](img/commit_nav_v13_11.png) ![Merge requests commit navigation](img/commit_nav_v13_11.png)
...@@ -268,7 +268,7 @@ the **Merge** button is colored red. ...@@ -268,7 +268,7 @@ the **Merge** button is colored red.
When a merge request is merged, you can see the post-merge pipeline status of When a merge request is merged, you can see the post-merge pipeline status of
the branch the merge request was merged into. For example, when a merge request the branch the merge request was merged into. For example, when a merge request
is merged into the `master` branch and then triggers a deployment to the staging is merged into the [default branch](../repository/branches/default.md) and then triggers a deployment to the staging
environment. environment.
Ongoing deployments are shown, and the state (deploying or deployed) Ongoing deployments are shown, and the state (deploying or deployed)
......
...@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do ...@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do
end end
it 'has the appropriate message' do it 'has the appropriate message' do
expect(subject.note).to eq('logged a resolving alert from **Some Service**') expect(subject.note).to eq('logged a recovery alert from **Some Service**')
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment