BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
48a4a934
Commit
48a4a934
authored
May 16, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address MR comments.
parent
9f800079
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
mr_widget_nothing_to_merge.js
...st_widget/components/states/mr_widget_nothing_to_merge.js
+0
-1
mr_widget_nothing_to_merge_spec.js
...dget/components/states/mr_widget_nothing_to_merge_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
View file @
48a4a934
...
...
@@ -32,7 +32,6 @@ export default {
<a
v-if="mr.newBlobPath"
:href="mr.newBlobPath"
role="button"
class="btn btn-inverted btn-save">
Create file
</a>
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
View file @
48a4a934
...
...
@@ -15,7 +15,7 @@ describe('MRWidgetNothingToMerge', () => {
it
(
'should have correct elements'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'mr-widget-body'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'a'
).
href
).
toContain
(
newBlobPath
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
"Currently there are no changes in this merge request's source branch"
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'Currently there are no changes in this merge request
\'
s source branch'
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'Please push new commits or use a different branch.'
);
});
...
...
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