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
8419533c
Commit
8419533c
authored
Oct 13, 2020
by
André Luís
Committed by
Phil Hughes
Oct 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the Commit box on the Merge Request Changs tab when browsing per commit
parent
def87658
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
56 deletions
+70
-56
app/assets/javascripts/diffs/components/commit_item.vue
app/assets/javascripts/diffs/components/commit_item.vue
+65
-56
changelogs/unreleased/254706-fix-commit-item-layout-on-mrs.yml
...elogs/unreleased/254706-fix-commit-item-layout-on-mrs.yml
+5
-0
No files found.
app/assets/javascripts/diffs/components/commit_item.vue
View file @
8419533c
...
@@ -122,8 +122,65 @@ export default {
...
@@ -122,8 +122,65 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<li
:class=
"
{ 'js-toggle-container': collapsible }" class="commit flex-row">
<li
:class=
"
{ 'js-toggle-container': collapsible }" class="commit">
<div
class=
"d-flex align-items-center align-self-start"
>
<div
class=
"d-block d-sm-flex flex-row-reverse justify-content-between align-items-start flex-lg-row-reverse"
>
<div
class=
"commit-actions flex-row d-none d-sm-flex align-items-start flex-wrap justify-content-end"
>
<div
v-if=
"commit.signature_html"
v-html=
"commit.signature_html"
></div>
<commit-pipeline-status
v-if=
"commit.pipeline_status_path"
:endpoint=
"commit.pipeline_status_path"
class=
"d-inline-flex mb-2"
/>
<gl-button-group
class=
"gl-ml-4 gl-mb-4"
data-testid=
"commit-sha-group"
>
<gl-button
label
class=
"gl-font-monospace"
v-text=
"commit.short_id"
/>
<clipboard-button
:text=
"commit.id"
:title=
"__('Copy commit SHA')"
class=
"input-group-text"
/>
</gl-button-group>
<div
v-if=
"hasNeighborCommits && glFeatures.mrCommitNeighborNav"
class=
"commit-nav-buttons ml-3"
>
<gl-button-group>
<gl-button
:href=
"previousCommitUrl"
:disabled=
"!commit.prev_commit_id"
@
click.prevent=
"moveToNeighboringCommit(
{ direction: 'previous' })"
>
<span
v-if=
"!commit.prev_commit_id"
v-gl-tooltip
class=
"h-100 w-100 position-absolute"
:title=
"__('You\'re at the first commit')"
></span>
<gl-icon
name=
"chevron-left"
/>
{{
__
(
'
Prev
'
)
}}
</gl-button>
<gl-button
:href=
"nextCommitUrl"
:disabled=
"!commit.next_commit_id"
@
click.prevent=
"moveToNeighboringCommit(
{ direction: 'next' })"
>
<span
v-if=
"!commit.next_commit_id"
v-gl-tooltip
class=
"h-100 w-100 position-absolute"
:title=
"__('You\'re at the last commit')"
></span>
{{
__
(
'
Next
'
)
}}
<gl-icon
name=
"chevron-right"
/>
</gl-button>
</gl-button-group>
</div>
</div>
<div>
<div
class=
"d-flex float-left align-items-center align-self-start"
>
<input
<input
v-if=
"isSelectable"
v-if=
"isSelectable"
class=
"mr-2"
class=
"mr-2"
...
@@ -167,7 +224,11 @@ export default {
...
@@ -167,7 +224,11 @@ export default {
{{
s__
(
'
CommitWidget|authored
'
)
}}
{{
s__
(
'
CommitWidget|authored
'
)
}}
<time-ago-tooltip
:time=
"commit.authored_date"
/>
<time-ago-tooltip
:time=
"commit.authored_date"
/>
</div>
</div>
</div>
</div>
</div>
</div>
<div>
<pre
<pre
v-if=
"commit.description_html"
v-if=
"commit.description_html"
:class=
"
{ 'js-toggle-content': collapsible, 'd-block': !collapsible }"
:class=
"
{ 'js-toggle-content': collapsible, 'd-block': !collapsible }"
...
@@ -175,57 +236,5 @@ export default {
...
@@ -175,57 +236,5 @@ export default {
v-html="commitDescription"
v-html="commitDescription"
>
</pre>
>
</pre>
</div>
</div>
<div
class=
"commit-actions flex-row d-none d-sm-flex"
>
<div
v-if=
"commit.signature_html"
v-html=
"commit.signature_html"
></div>
<commit-pipeline-status
v-if=
"commit.pipeline_status_path"
:endpoint=
"commit.pipeline_status_path"
class=
"d-inline-flex"
/>
<gl-button-group
class=
"gl-ml-4"
data-testid=
"commit-sha-group"
>
<gl-button
label
class=
"gl-font-monospace"
v-text=
"commit.short_id"
/>
<clipboard-button
:text=
"commit.id"
:title=
"__('Copy commit SHA')"
class=
"input-group-text"
/>
</gl-button-group>
<div
v-if=
"hasNeighborCommits && glFeatures.mrCommitNeighborNav"
class=
"commit-nav-buttons ml-3"
>
<gl-button-group>
<gl-button
:href=
"previousCommitUrl"
:disabled=
"!commit.prev_commit_id"
@
click.prevent=
"moveToNeighboringCommit(
{ direction: 'previous' })"
>
<span
v-if=
"!commit.prev_commit_id"
v-gl-tooltip
class=
"h-100 w-100 position-absolute"
:title=
"__('You\'re at the first commit')"
></span>
<gl-icon
name=
"chevron-left"
/>
{{
__
(
'
Prev
'
)
}}
</gl-button>
<gl-button
:href=
"nextCommitUrl"
:disabled=
"!commit.next_commit_id"
@
click.prevent=
"moveToNeighboringCommit(
{ direction: 'next' })"
>
<span
v-if=
"!commit.next_commit_id"
v-gl-tooltip
class=
"h-100 w-100 position-absolute"
:title=
"__('You\'re at the last commit')"
></span>
{{
__
(
'
Next
'
)
}}
<gl-icon
name=
"chevron-right"
/>
</gl-button>
</gl-button-group>
</div>
</div>
</div>
</li>
</li>
</
template
>
</
template
>
changelogs/unreleased/254706-fix-commit-item-layout-on-mrs.yml
0 → 100644
View file @
8419533c
---
title
:
Improve the Commit box on the Merge Request Changs tab when browsing per commit
merge_request
:
43613
author
:
type
:
fixed
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