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
8f7c35fc
Commit
8f7c35fc
authored
Feb 14, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
d0169717
e865ee2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
...merge_request_widget/components/states/commits_header.vue
+2
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
View file @
8f7c35fc
...
...
@@ -73,14 +73,14 @@ export default {
<gl-button
:aria-label=
"ariaLabel"
variant=
"blank"
class=
"commit-edit-toggle mr-2"
class=
"commit-edit-toggle
square s24
mr-2"
@
click.stop=
"toggle()"
>
<icon
:name=
"collapseIcon"
:size=
"16"
/>
</gl-button>
<span
v-if=
"expanded"
>
{{
__
(
'
Collapse
'
)
}}
</span>
<span
v-else
>
<span
v-html=
"message"
></span>
<span
class=
"vertical-align-middle"
v-html=
"message"
></span>
<gl-button
variant=
"link"
class=
"modify-message-button"
>
{{
modifyLinkMessage
}}
</gl-button>
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
8f7c35fc
...
...
@@ -1017,3 +1017,8 @@
z-index
:
99999
;
background
:
$black-transparent
;
}
.source-branch-removal-status
{
padding-left
:
50px
;
padding-bottom
:
$gl-padding
;
}
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