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
06a187cf
Commit
06a187cf
authored
Jan 25, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update missing paths
parent
4de9710a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-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
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
...rge_request_widget/components/states/mr_widget_closed.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
..._request_widget/components/states/mr_widget_conflicts.vue
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
...vue_mr_widget/components/states/mr_widget_merging_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
View file @
06a187cf
<
script
>
import
statusIcon
from
'
../mr_widget_status_icon
'
;
import
statusIcon
from
'
../mr_widget_status_icon
.vue
'
;
export
default
{
name
:
'
MRWidgetChecking
'
,
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
View file @
06a187cf
<
script
>
import
mrWidgetAuthorTime
from
'
../../components/mr_widget_author_time
'
;
import
statusIcon
from
'
../mr_widget_status_icon
'
;
import
statusIcon
from
'
../mr_widget_status_icon
.vue
'
;
export
default
{
name
:
'
MRWidgetClosed
'
,
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
View file @
06a187cf
<
script
>
import
statusIcon
from
'
../mr_widget_status_icon
'
;
import
statusIcon
from
'
../mr_widget_status_icon
.vue
'
;
export
default
{
name
:
'
MRWidgetConflicts
'
,
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
View file @
06a187cf
...
...
@@ -19,8 +19,8 @@ describe('MRWidgetMerging', () => {
it
(
'
renders information about merge request being merged
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
(),
).
to
Equal
(
'
This merge request is in the process of being merged
'
);
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
()
.
replace
(
/
\s\s
+/g
,
'
'
).
replace
(
/
[\r\n]
+/g
,
'
'
)
,
).
to
Contain
(
'
This merge request is in the process of being merged
'
);
});
it
(
'
renders branch information
'
,
()
=>
{
...
...
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