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
ff64773b
Commit
ff64773b
authored
Jul 27, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update merge request button message for license-check approvals
* Update text and i18n translations * Update unit tests
parent
111b6286
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_policy_violation.vue
...t_widget/components/states/mr_widget_policy_violation.vue
+1
-1
ee/changelogs/unreleased/231250-fix-license-check-approval-message.yml
.../unreleased/231250-fix-license-check-approval-message.yml
+5
-0
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_policy_violation_spec.js
...dget/components/states/mr_widget_policy_violation_spec.js
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+2
-2
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_policy_violation.vue
View file @
ff64773b
...
...
@@ -20,7 +20,7 @@ export default {
</div>
<div
class=
"media-body"
>
<strong
class=
"gl-font-weight-bold gl-text-gray-800 gl-pl-2"
>
{{
s__
(
'
mrWidget|You can
only merge once the denied license is removed
'
)
}}
{{
s__
(
'
mrWidget|You can
merge after removing denied licenses
'
)
}}
</strong>
</div>
</div>
...
...
ee/changelogs/unreleased/231250-fix-license-check-approval-message.yml
0 → 100644
View file @
ff64773b
---
title
:
Update merge request button messaging for license-check approval
merge_request
:
231250
author
:
type
:
fixed
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_policy_violation_spec.js
View file @
ff64773b
...
...
@@ -26,6 +26,6 @@ describe('EE MrWidgetPolicyViolation', () => {
});
it
(
'
shows the disabled reason
'
,
()
=>
{
expect
(
wrapper
.
text
()).
toContain
(
'
You can
only merge once the denied license is removed
'
);
expect
(
wrapper
.
text
()).
toContain
(
'
You can
merge after removing denied licenses
'
);
});
});
locale/gitlab.pot
View file @
ff64773b
...
...
@@ -28727,10 +28727,10 @@ msgstr ""
msgid "mrWidget|You can delete the source branch now"
msgstr ""
msgid "mrWidget|You can merge
this merge request manually using the
"
msgid "mrWidget|You can merge
after removing denied licenses
"
msgstr ""
msgid "mrWidget|You can
only merge once the denied license is removed
"
msgid "mrWidget|You can
merge this merge request manually using the
"
msgstr ""
msgid "mrWidget|Your password"
...
...
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