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
16eb2d74
Commit
16eb2d74
authored
May 19, 2021
by
jerasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove code owner banner announcement
Removed the announcement banner from code
parent
27275e6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
14 deletions
+5
-14
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
...projects/_merge_request_approvals_settings_form.html.haml
+0
-11
ee/changelogs/unreleased/326838-remove-code-owner-banner.yml
ee/changelogs/unreleased/326838-remove-code-owner-banner.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
View file @
16eb2d74
...
...
@@ -11,17 +11,6 @@
%fieldset
.form-group
%legend
.h5.gl-border-none
=
_
(
'Approval settings'
)
-
if
project
.
code_owner_approval_required_available?
.gl-alert.gl-alert-info.gl-mb-4.fade.in.show
{
role:
"alert"
}
%button
.js-close.gl-alert-dismiss
{
type:
"button"
,
'data-dismiss'
:
"alert"
,
'aria-label'
:
"Close"
}
%span
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'gl-icon'
)
%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
sprite_icon
(
'question-o'
),
help_page_path
(
'user/project/protected_branches'
,
anchor:
'protected-branches-approval-by-code-owners'
),
target:
'_blank'
.gl-form-checkbox-group
.gl-form-checkbox.custom-control.custom-checkbox
=
form
.
check_box
(
:disable_overriding_approvers_per_merge_request
,
{
class:
'custom-control-input'
,
disabled:
!
can_modify_approvers
})
...
...
ee/changelogs/unreleased/326838-remove-code-owner-banner.yml
0 → 100644
View file @
16eb2d74
---
title
:
Remove code owner ribbon move announcement from settings
merge_request
:
62069
author
:
type
:
changed
locale/gitlab.pot
View file @
16eb2d74
...
...
@@ -32115,9 +32115,6 @@ 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 %{featureName} feature is part of your GitLab Ultimate trial."
msgstr ""
...
...
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