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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
5d7d5098
Commit
5d7d5098
authored
May 10, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MRWidget: Fix target branch link.
parent
e7b53dd6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js
...erge_request_widget/components/states/mr_widget_locked.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
...mponents/states/mr_widget_merge_when_pipeline_succeeds.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-0
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
...scripts/vue_mr_widget/components/mr_widget_header_spec.js
+10
-3
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js
View file @
5d7d5098
...
...
@@ -16,7 +16,7 @@ export default {
The changes will be merged into
<span class="label-branch">
<a :href="mr.targetBranchPath">{{mr.targetBranch}}</a>
</span>
</span>
.
</p>
</section>
</div>
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
View file @
5d7d5098
...
...
@@ -87,7 +87,7 @@ export default {
:href="mr.targetBranchPath"
class="label-branch">
{{mr.targetBranch}}
</a>
</a>
.
</p>
<p v-if="mr.shouldRemoveSourceBranch">
The source branch will be removed.
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
5d7d5098
...
...
@@ -43,6 +43,7 @@ export default class MergeRequestStore {
this
.
mergeUserId
=
data
.
merge_user_id
;
this
.
currentUserId
=
gon
.
current_user_id
;
this
.
sourceBranchPath
=
data
.
source_branch_path
;
this
.
targetBranchCommitsPath
=
data
.
target_branch_commits_path
;
this
.
sourceBranchLink
=
data
.
source_branch_with_namespace_link
;
this
.
mergeError
=
data
.
merge_error
;
this
.
targetBranchPath
=
data
.
target_branch_commits_path
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
View file @
5d7d5098
...
...
@@ -48,10 +48,12 @@ describe('MRWidgetHeader', () => {
describe
(
'
template
'
,
()
=>
{
let
vm
;
let
el
;
const
sourceBranchPath
=
'
/foo/bar/mr-widget-refactor
'
;
const
mr
=
{
divergedCommitsCount
:
12
,
sourceBranch
:
'
mr-widget-refactor
'
,
sourceBranchLink
:
'
/foo/bar/mr-widget-refactor
'
,
sourceBranchLink
:
`<a href="
${
sourceBranchPath
}
">mr-widget-refactor</a>`
,
targetBranchCommitsPath
:
'
foo/bar/commits-path
'
,
targetBranch
:
'
master
'
,
isOpen
:
true
,
emailPatchesPath
:
'
/mr/email-patches
'
,
...
...
@@ -65,8 +67,13 @@ describe('MRWidgetHeader', () => {
it
(
'
should render template elements correctly
'
,
()
=>
{
expect
(
el
.
classList
.
contains
(
'
mr-source-target
'
)).
toBeTruthy
();
expect
(
el
.
querySelectorAll
(
'
.label-branch
'
)[
0
].
textContent
).
toContain
(
mr
.
sourceBranch
);
expect
(
el
.
querySelectorAll
(
'
.label-branch
'
)[
1
].
textContent
).
toContain
(
mr
.
targetBranch
);
const
sourceBranchLink
=
el
.
querySelectorAll
(
'
.label-branch
'
)[
0
];
const
targetBranchLink
=
el
.
querySelectorAll
(
'
.label-branch
'
)[
1
];
expect
(
sourceBranchLink
.
textContent
).
toContain
(
mr
.
sourceBranch
);
expect
(
targetBranchLink
.
textContent
).
toContain
(
mr
.
targetBranch
);
expect
(
sourceBranchLink
.
querySelector
(
'
a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
sourceBranchPath
);
expect
(
targetBranchLink
.
querySelector
(
'
a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
mr
.
targetBranchCommitsPath
);
expect
(
el
.
querySelector
(
'
.diverged-commits-count
'
).
textContent
).
toContain
(
'
12 commits behind
'
);
expect
(
el
.
textContent
).
toContain
(
'
Check out 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