Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a7c77ef7
Commit
a7c77ef7
authored
Apr 06, 2021
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
dd5054d7
0f5d90d2
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
7 deletions
+14
-7
app/services/projects/alerting/notify_service.rb
app/services/projects/alerting/notify_service.rb
+1
-1
app/services/system_notes/alert_management_service.rb
app/services/system_notes/alert_management_service.rb
+1
-1
changelogs/unreleased/sy-system-note-recovery-alert-string-change.yml
...nreleased/sy-system-note-recovery-alert-string-change.yml
+5
-0
doc/user/packages/container_registry/index.md
doc/user/packages/container_registry/index.md
+2
-1
doc/user/packages/package_registry/index.md
doc/user/packages/package_registry/index.md
+2
-1
doc/user/project/merge_requests/img/commit_nav_v13_11.png
doc/user/project/merge_requests/img/commit_nav_v13_11.png
+0
-0
doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
...t/merge_requests/reviewing_and_managing_merge_requests.md
+2
-2
spec/services/system_notes/alert_management_service_spec.rb
spec/services/system_notes/alert_management_service_spec.rb
+1
-1
No files found.
app/services/projects/alerting/notify_service.rb
View file @
a7c77ef7
...
...
@@ -36,7 +36,7 @@ module Projects
override
:alert_source
def
alert_source
alert
.
monitoring_tool
||
integration
&
.
name
||
'Generic Alert Endpoint'
super
||
integration
&
.
name
||
'Generic Alert Endpoint'
end
def
active_integration?
...
...
app/services/system_notes/alert_management_service.rb
View file @
a7c77ef7
...
...
@@ -73,7 +73,7 @@ module SystemNotes
#
# Returns the created Note object
def
log_resolving_alert
(
monitoring_tool
)
body
=
"logged a re
solving
alert from **
#{
monitoring_tool
}
**"
body
=
"logged a re
covery
alert from **
#{
monitoring_tool
}
**"
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
User
.
alert_bot
,
body
,
action:
'new_alert_added'
))
end
...
...
changelogs/unreleased/sy-system-note-recovery-alert-string-change.yml
0 → 100644
View file @
a7c77ef7
---
title
:
Update resolving alert system notes to use term Recovery Alert
merge_request
:
58513
author
:
type
:
changed
doc/user/packages/container_registry/index.md
View file @
a7c77ef7
...
...
@@ -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
**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.
...
...
doc/user/packages/package_registry/index.md
View file @
a7c77ef7
...
...
@@ -19,7 +19,8 @@ You can view packages for your project or group.
1.
Go to the project or group.
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.
...
...
doc/user/project/merge_requests/img/commit_nav_v13_11.png
View replaced file @
dd5054d7
View file @
a7c77ef7
76.7 KB
|
W:
|
H:
23.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
View file @
a7c77ef7
...
...
@@ -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.
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.
![
Merge requests commit navigation
](
img/commit_nav_v13_11.png
)
...
...
@@ -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
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.
Ongoing deployments are shown, and the state (deploying or deployed)
...
...
spec/services/system_notes/alert_management_service_spec.rb
View file @
a7c77ef7
...
...
@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do
end
it
'has the appropriate message'
do
expect
(
subject
.
note
).
to
eq
(
'logged a re
solving
alert from **Some Service**'
)
expect
(
subject
.
note
).
to
eq
(
'logged a re
covery
alert from **Some Service**'
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment