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
8676e062
Commit
8676e062
authored
Jun 09, 2021
by
Amy Qualls
Committed by
Phil Hughes
Jun 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial message for blocked pipeline in MRs
parent
51040942
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
...t_widget/components/states/mr_widget_pipeline_blocked.vue
+3
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+2
-2
spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
...dget/components/states/mr_widget_pipeline_blocked_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
View file @
8676e062
...
@@ -14,8 +14,9 @@ export default {
...
@@ -14,8 +14,9 @@ export default {
<div
class=
"media-body space-children"
>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
<span
class=
"bold"
>
{{
{{
s__
(
`mrWidget|Pipeline blocked.
s__
(
The pipeline for this merge request requires a manual action to proceed`
)
`mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.`
,
)
}}
}}
</span>
</span>
</div>
</div>
...
...
locale/gitlab.pot
View file @
8676e062
...
@@ -39066,6 +39066,9 @@ msgstr ""
...
@@ -39066,6 +39066,9 @@ msgstr ""
msgid "mrWidget|Merge blocked: all threads must be resolved."
msgid "mrWidget|Merge blocked: all threads must be resolved."
msgstr ""
msgstr ""
msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue."
msgstr ""
msgid "mrWidget|Merge failed."
msgid "mrWidget|Merge failed."
msgstr ""
msgstr ""
...
@@ -39102,9 +39105,6 @@ msgstr ""
...
@@ -39102,9 +39105,6 @@ msgstr ""
msgid "mrWidget|Open in Web IDE"
msgid "mrWidget|Open in Web IDE"
msgstr ""
msgstr ""
msgid "mrWidget|Pipeline blocked. The pipeline for this merge request requires a manual action to proceed"
msgstr ""
msgid "mrWidget|Plain diff"
msgid "mrWidget|Plain diff"
msgstr ""
msgstr ""
...
...
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file @
8676e062
...
@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
...
@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
end
end
it
'shows information about blocked pipeline'
do
it
'shows information about blocked pipeline'
do
expect
(
page
).
to
have_content
(
"
Pipelin
e blocked"
)
expect
(
page
).
to
have_content
(
"
Merg
e blocked"
)
expect
(
page
).
to
have_content
(
expect
(
page
).
to
have_content
(
"
The pipeline for this merge request requires a manual action
"
)
"
pipeline must succeed. It's waiting for a manual action to continue.
"
)
expect
(
page
).
to
have_css
(
'.ci-status-icon-manual'
)
expect
(
page
).
to
have_css
(
'.ci-status-icon-manual'
)
end
end
end
end
...
...
spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
View file @
8676e062
...
@@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => {
...
@@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => {
createWrapper
();
createWrapper
();
expect
(
wrapper
.
text
()).
toBe
(
expect
(
wrapper
.
text
()).
toBe
(
'
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
'
,
"
Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.
"
,
);
);
});
});
});
});
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