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
Jérome Perrin
gitlab-ce
Commits
6eeb6384
Commit
6eeb6384
authored
Jul 11, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make commits behind text a link to the target branch commits page
parent
09193a4f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
46 additions
and
7 deletions
+46
-7
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
...s/vue_merge_request_widget/components/mr_widget_header.js
+2
-2
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+2
-1
app/presenters/merge_request_presenter.rb
app/presenters/merge_request_presenter.rb
+6
-0
app/serializers/merge_request_entity.rb
app/serializers/merge_request_entity.rb
+4
-0
spec/fixtures/api/schemas/entities/merge_request.json
spec/fixtures/api/schemas/entities/merge_request.json
+1
-0
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
...scripts/vue_mr_widget/components/mr_widget_header_spec.js
+5
-2
spec/presenters/merge_request_presenter_spec.rb
spec/presenters/merge_request_presenter_spec.rb
+24
-0
spec/serializers/merge_request_entity_spec.rb
spec/serializers/merge_request_entity_spec.rb
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file @
6eeb6384
...
...
@@ -92,13 +92,13 @@ export default {
:class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}"
:title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''"
data-placement="bottom">
<a :href="mr.targetBranchPath">{{mr.targetBranch}}</a>
<a :href="mr.targetBranch
Tree
Path">{{mr.targetBranch}}</a>
</span>
</strong>
<span
v-if="shouldShowCommitsBehindText"
class="diverged-commits-count">
(
{{mr.divergedCommitsCount}} {{commitsText}} behind
)
(
<a :href="mr.targetBranchPath">{{mr.divergedCommitsCount}} {{commitsText}} behind</a>
)
</span>
</div>
</div>
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
6eeb6384
...
...
@@ -47,7 +47,8 @@ export default class MergeRequestStore {
this
.
sourceBranchPath
=
data
.
source_branch_path
;
this
.
sourceBranchLink
=
data
.
source_branch_with_namespace_link
;
this
.
mergeError
=
data
.
merge_error
;
this
.
targetBranchPath
=
data
.
target_branch_tree_path
;
this
.
targetBranchPath
=
data
.
target_branch_commits_path
;
this
.
targetBranchTreePath
=
data
.
target_branch_tree_path
;
this
.
conflictResolutionPath
=
data
.
conflict_resolution_path
;
this
.
cancelAutoMergePath
=
data
.
cancel_merge_when_pipeline_succeeds_path
;
this
.
removeWIPPath
=
data
.
remove_wip_path
;
...
...
app/presenters/merge_request_presenter.rb
View file @
6eeb6384
...
...
@@ -82,6 +82,12 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
end
end
def
target_branch_commits_path
if
target_branch_exists?
project_commits_path
(
project
,
target_branch
)
end
end
def
source_branch_path
if
source_branch_exists?
project_branch_path
(
source_project
,
source_branch
)
...
...
app/serializers/merge_request_entity.rb
View file @
6eeb6384
...
...
@@ -93,6 +93,10 @@ class MergeRequestEntity < IssuableEntity
# Paths
#
expose
:target_branch_commits_path
do
|
merge_request
|
presenter
(
merge_request
).
target_branch_commits_path
end
expose
:target_branch_tree_path
do
|
merge_request
|
presenter
(
merge_request
).
target_branch_tree_path
end
...
...
spec/fixtures/api/schemas/entities/merge_request.json
View file @
6eeb6384
...
...
@@ -74,6 +74,7 @@
},
"additionalProperties"
:
false
},
"target_branch_commits_path"
:
{
"type"
:
"string"
},
"target_branch_tree_path"
:
{
"type"
:
"string"
},
"source_branch_path"
:
{
"type"
:
"string"
},
"conflict_resolution_path"
:
{
"type"
:
[
"string"
,
"null"
]
},
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
View file @
6eeb6384
...
...
@@ -54,6 +54,7 @@ describe('MRWidgetHeader', () => {
sourceBranch
:
'
mr-widget-refactor
'
,
sourceBranchLink
:
`<a href="
${
sourceBranchPath
}
">mr-widget-refactor</a>`
,
targetBranchPath
:
'
foo/bar/commits-path
'
,
targetBranchTreePath
:
'
foo/bar/tree/path
'
,
targetBranch
:
'
master
'
,
isOpen
:
true
,
emailPatchesPath
:
'
/mr/email-patches
'
,
...
...
@@ -69,12 +70,14 @@ describe('MRWidgetHeader', () => {
expect
(
el
.
classList
.
contains
(
'
mr-source-target
'
)).
toBeTruthy
();
const
sourceBranchLink
=
el
.
querySelectorAll
(
'
.label-branch
'
)[
0
];
const
targetBranchLink
=
el
.
querySelectorAll
(
'
.label-branch
'
)[
1
];
const
commitsCount
=
el
.
querySelector
(
'
.diverged-commits-count
'
);
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
.
targetBranchPath
);
expect
(
el
.
querySelector
(
'
.diverged-commits-count
'
).
textContent
).
toContain
(
'
12 commits behind
'
);
expect
(
targetBranchLink
.
querySelector
(
'
a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
mr
.
targetBranchTreePath
);
expect
(
commitsCount
.
textContent
).
toContain
(
'
12 commits behind
'
);
expect
(
commitsCount
.
querySelector
(
'
a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
mr
.
targetBranchPath
);
expect
(
el
.
textContent
).
toContain
(
'
Check out branch
'
);
expect
(
el
.
querySelectorAll
(
'
.dropdown li a
'
)[
0
].
getAttribute
(
'
href
'
)).
toEqual
(
mr
.
emailPatchesPath
);
...
...
spec/presenters/merge_request_presenter_spec.rb
View file @
6eeb6384
...
...
@@ -317,6 +317,30 @@ describe MergeRequestPresenter do
end
end
describe
'#target_branch_commits_path'
do
subject
do
described_class
.
new
(
resource
,
current_user:
user
)
.
target_branch_commits_path
end
context
'when target branch exists'
do
it
'returns path'
do
allow
(
resource
).
to
receive
(
:target_branch_exists?
)
{
true
}
is_expected
.
to
eq
(
"/
#{
resource
.
target_project
.
full_path
}
/commits/
#{
resource
.
target_branch
}
"
)
end
end
context
'when target branch does not exists'
do
it
'returns nil'
do
allow
(
resource
).
to
receive
(
:target_branch_exists?
)
{
false
}
is_expected
.
to
be_nil
end
end
end
describe
'#target_branch_tree_path'
do
subject
do
described_class
.
new
(
resource
,
current_user:
user
)
...
...
spec/serializers/merge_request_entity_spec.rb
View file @
6eeb6384
...
...
@@ -46,8 +46,8 @@ describe MergeRequestEntity do
:conflict_resolution_path
,
:cancel_merge_when_pipeline_succeeds_path
,
:create_issue_to_resolve_discussions_path
,
:source_branch_path
,
:target_branch_
tree
_path
,
:commits_count
)
:source_branch_path
,
:target_branch_
commits
_path
,
:
target_branch_tree_path
,
:
commits_count
)
end
it
'has email_patches_path'
do
...
...
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