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
c4f203de
Commit
c4f203de
authored
Jul 17, 2020
by
Marcel van Remmerden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change wording of state to check merge blockers
parent
4556e138
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
...e_request_widget/components/states/mr_widget_checking.vue
+1
-1
changelogs/unreleased/229155-clarify-checking-ability-to-merge-automatically-message-on-mr-widg.yml
...ing-ability-to-merge-automatically-message-on-mr-widg.yml
+5
-0
ee/spec/features/merge_request/user_approves_spec.rb
ee/spec/features/merge_request/user_approves_spec.rb
+1
-1
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
.../features/merge_request/user_sees_approval_widget_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/frontend/vue_mr_widget/components/states/mr_widget_checking_spec.js
...ue_mr_widget/components/states/mr_widget_checking_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
View file @
c4f203de
...
...
@@ -12,7 +12,7 @@ export default {
<div
class=
"mr-widget-body media"
>
<status-icon
:show-disabled-button=
"true"
status=
"loading"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
{{
s__
(
'
mrWidget|Checking
ability to merge automatically
…
'
)
}}
</span>
<span
class=
"bold"
>
{{
s__
(
'
mrWidget|Checking
if merge request can be merged
…
'
)
}}
</span>
</div>
</div>
</
template
>
changelogs/unreleased/229155-clarify-checking-ability-to-merge-automatically-message-on-mr-widg.yml
0 → 100644
View file @
c4f203de
---
title
:
Change loading MR message wording
merge_request
:
37181
author
:
type
:
changed
ee/spec/features/merge_request/user_approves_spec.rb
View file @
c4f203de
...
...
@@ -97,7 +97,7 @@ RSpec.xdescribe 'Merge request > User approves', :js do
end
it
'does not show checking ability text'
do
expect
(
find
(
'.js-mr-approvals'
)).
not_to
have_text
(
'Checking
ability to merge automatically
'
)
expect
(
find
(
'.js-mr-approvals'
)).
not_to
have_text
(
'Checking
if merge request can be merged
'
)
expect
(
find
(
'.js-mr-approvals'
)).
to
have_selector
(
'.approvals-body'
)
end
end
...
...
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
View file @
c4f203de
...
...
@@ -24,7 +24,7 @@ RSpec.describe 'Merge request > User sees approval widget', :js do
# TODO: https://gitlab.com/gitlab-org/gitlab/issues/9430
xit
'does not show checking ability text'
do
expect
(
find
(
'.js-mr-approvals'
)).
not_to
have_text
(
'Checking
ability to merge automatically
'
)
expect
(
find
(
'.js-mr-approvals'
)).
not_to
have_text
(
'Checking
if merge request can be merged
'
)
expect
(
find
(
'.js-mr-approvals'
)).
to
have_selector
(
'.approvals-body'
)
end
end
...
...
locale/gitlab.pot
View file @
c4f203de
...
...
@@ -28283,7 +28283,7 @@ msgstr ""
msgid "mrWidget|Check out branch"
msgstr ""
msgid "mrWidget|Checking
ability to merge automatically
…"
msgid "mrWidget|Checking
if merge request can be merged
…"
msgstr ""
msgid "mrWidget|Cherry-pick"
...
...
spec/frontend/vue_mr_widget/components/states/mr_widget_checking_spec.js
View file @
c4f203de
...
...
@@ -25,7 +25,7 @@ describe('MRWidgetChecking', () => {
it
(
'
renders information about merging
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
()).
toEqual
(
'
Checking
ability to merge automatically
…
'
,
'
Checking
if merge request can be merged
…
'
,
);
});
});
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