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
ea821730
Commit
ea821730
authored
Dec 11, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix button alignment on MWPS component
parent
806a68a8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
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
+13
-6
changelogs/unreleased/38541-cancel-alignment.yml
changelogs/unreleased/38541-cancel-alignment.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
View file @
ea821730
...
@@ -65,10 +65,12 @@ export default {
...
@@ -65,10 +65,12 @@ export default {
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="success" />
<status-icon status="success" />
<div class="media-body">
<div class="media-body">
<h4>
<h4 class="flex-container-block">
<span class="append-right-10">
Set by
Set by
<mr-widget-author :author="mr.setToMWPSBy" />
<mr-widget-author :author="mr.setToMWPSBy" />
to be merged automatically when the pipeline succeeds
to be merged automatically when the pipeline succeeds
</span>
<a
<a
v-if="mr.canCancelAutomaticMerge"
v-if="mr.canCancelAutomaticMerge"
@click.prevent="cancelAutomaticMerge"
@click.prevent="cancelAutomaticMerge"
...
@@ -94,8 +96,13 @@ export default {
...
@@ -94,8 +96,13 @@ export default {
<p v-if="mr.shouldRemoveSourceBranch">
<p v-if="mr.shouldRemoveSourceBranch">
The source branch will be removed
The source branch will be removed
</p>
</p>
<p v-else>
<p
v-else
class="flex-container-block"
>
<span class="append-right-10">
The source branch will not be removed
The source branch will not be removed
</span>
<a
<a
v-if="canRemoveSourceBranch"
v-if="canRemoveSourceBranch"
:disabled="isRemovingSourceBranch"
:disabled="isRemovingSourceBranch"
...
...
changelogs/unreleased/38541-cancel-alignment.yml
0 → 100644
View file @
ea821730
---
title
:
fix button alignment on MWPS component
merge_request
:
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