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
f9b788fa
Commit
f9b788fa
authored
Nov 23, 2021
by
Amy Qualls
Committed by
Kushal Pandya
Nov 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revise UI text line about merge dependencies
parent
f0540337
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
+3
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
View file @
f9b788fa
import
{
__
}
from
'
~/locale
'
;
export
const
MERGE_DISABLED_TEXT
=
__
(
'
You can only merge once the items above are resolved.
'
);
export
const
MERGE_DISABLED_TEXT
=
__
(
'
Merge blocked: all merge request dependencies must be merged or closed.
'
,
);
export
const
MERGE_DISABLED_SKIPPED_PIPELINE_TEXT
=
__
(
"
Merge blocked: pipeline must succeed. It's waiting for a manual job to continue.
"
,
);
...
...
locale/gitlab.pot
View file @
f9b788fa
...
...
@@ -21737,6 +21737,9 @@ msgstr ""
msgid "Merge automatically (%{strategy})"
msgstr ""
msgid "Merge blocked: all merge request dependencies must be merged or closed."
msgstr ""
msgid "Merge blocked: new changes were just added."
msgstr ""
...
...
@@ -39596,9 +39599,6 @@ msgstr ""
msgid "You can only edit files when you are on a branch"
msgstr ""
msgid "You can only merge once the items above are resolved."
msgstr ""
msgid "You can only merge once this merge request is approved."
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