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
d6fa18c9
Commit
d6fa18c9
authored
Feb 21, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
79ee9be9
a6d52ff8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
d6fa18c9
...
@@ -315,7 +315,7 @@ export default {
...
@@ -315,7 +315,7 @@ export default {
:endpoint=
"mr.testResultsPath"
:endpoint=
"mr.testResultsPath"
/>
/>
<div
class=
"mr-widget-section
p-0
"
>
<div
class=
"mr-widget-section"
>
<component
:is=
"componentName"
:mr=
"mr"
:service=
"service"
/>
<component
:is=
"componentName"
:mr=
"mr"
:service=
"service"
/>
<section
v-if=
"shouldRenderCollaborationStatus"
class=
"mr-info-list mr-links"
>
<section
v-if=
"shouldRenderCollaborationStatus"
class=
"mr-info-list mr-links"
>
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
d6fa18c9
...
@@ -82,7 +82,6 @@
...
@@ -82,7 +82,6 @@
}
}
.mr-widget-body
,
.mr-widget-body
,
.mr-widget-section
,
.mr-widget-content
,
.mr-widget-content
,
.mr-widget-footer
{
.mr-widget-footer
{
padding
:
$gl-padding
;
padding
:
$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