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
576bc3c5
Commit
576bc3c5
authored
Oct 18, 2019
by
Samantha Ming
Committed by
Paul Slaughter
Oct 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add code owner ribbon move announcement
parent
0848f550
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
...projects/_merge_request_approvals_settings_form.html.haml
+11
-0
ee/changelogs/unreleased/34291-code-owner-ribbon.yml
ee/changelogs/unreleased/34291-code-owner-ribbon.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
View file @
576bc3c5
...
...
@@ -12,6 +12,17 @@
.text-center.prepend-top-default
=
sprite_icon
(
'spinner'
,
size:
24
,
css_class:
'gl-spinner'
)
-
if
project
.
code_owner_approval_required_available?
.alert.alert-dismissible.alert-primary.fade.in.show
{
role:
"alert"
}
%button
.close
{
type:
"button"
,
'data-dismiss'
:
"alert"
,
'aria-label'
:
"Close"
}
%span
=
sprite_icon
(
'close'
,
size:
16
)
%span
-
banner_url
=
project_settings_repository_path
(
project
,
anchor:
'js-protected-branches-settings'
)
-
banner_link_start
=
'<a href="%{url}"><strong>'
.
html_safe
%
{
url:
banner_url
}
=
_
(
'The "Require approval from CODEOWNERS" setting was moved to %{banner_link_start}Protected Branches%{banner_link_end}'
).
html_safe
%
{
banner_link_start:
banner_link_start
,
banner_link_end:
'</strong></a>'
.
html_safe
}
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/protected_branches'
,
anchor:
'protected-branches-approval-by-code-owners-premium'
),
target:
'_blank'
.form-group
.form-check
=
form
.
check_box
(
:disable_overriding_approvers_per_merge_request
,
{
checked:
can_override_approvers
,
class:
'form-check-input'
},
false
,
true
)
...
...
ee/changelogs/unreleased/34291-code-owner-ribbon.yml
0 → 100644
View file @
576bc3c5
---
title
:
Add alert message for feature 'require approval from code owners' being moved
merge_request
:
18715
author
:
type
:
changed
locale/gitlab.pot
View file @
576bc3c5
...
...
@@ -16213,6 +16213,9 @@ msgstr ""
msgid "The \"%{group_path}\" group allows you to sign in with your Single Sign-On Account"
msgstr ""
msgid "The \"Require approval from CODEOWNERS\" setting was moved to %{banner_link_start}Protected Branches%{banner_link_end}"
msgstr ""
msgid "The %{type} contains the following error:"
msgid_plural "The %{type} contains the following errors:"
msgstr[0] ""
...
...
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