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
e51f78bb
Commit
e51f78bb
authored
Oct 26, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btn-small -> btn-sm
parent
a5db2157
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/issuable/related_issues/components/related_issues_block.vue
...suable/related_issues/components/related_issues_block.vue
+1
-1
changelogs/unreleased-ee/3637-small-button.yml
changelogs/unreleased-ee/3637-small-button.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
...rge_request_widget/components/approvals/approvals_body.js
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js
...e_request_widget/components/approvals/approvals_footer.js
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
...rge_request_widget/components/states/mr_widget_rebase.vue
+1
-1
No files found.
app/assets/javascripts/issuable/related_issues/components/related_issues_block.vue
View file @
e51f78bb
...
...
@@ -119,7 +119,7 @@ export default {
v-if=
"canAddRelatedIssues"
ref=
"issueCountBadgeAddButton"
type=
"button"
class=
"js-issue-count-badge-add-button issue-count-badge-add-button btn btn-sm
all
btn-default"
class=
"js-issue-count-badge-add-button issue-count-badge-add-button btn btn-sm btn-default"
aria-label=
"Add an issue"
data-placement=
"top"
@
click=
"toggleAddRelatedIssuesForm"
>
...
...
changelogs/unreleased-ee/3637-small-button.yml
0 → 100644
View file @
e51f78bb
---
title
:
fix height of rebase and approve buttons
merge_request
:
author
:
type
:
fixed
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
View file @
e51f78bb
...
...
@@ -75,7 +75,7 @@ export default {
<button
:disabled="approving"
@click="approveMergeRequest"
class="btn btn-primary btn-sm
all
approve-btn">
class="btn btn-primary btn-sm approve-btn">
<i
v-if="approving"
class="fa fa-spinner fa-spin"
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js
View file @
e51f78bb
...
...
@@ -93,7 +93,7 @@ export default {
type="button"
:disabled="unapproving"
@click="unapproveMergeRequest"
class="btn btn-sm
all
unapprove-btn-wrap">
class="btn btn-sm unapprove-btn-wrap">
<i
v-if="unapproving"
class="fa fa-spinner fa-spin"
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
View file @
e51f78bb
...
...
@@ -109,7 +109,7 @@
<div
class=
"accept-merge-holder clearfix js-toggle-container accept-action media space-children"
>
<button
type=
"button"
class=
"btn btn-sm
all
btn-reopen btn-success"
class=
"btn btn-sm btn-reopen btn-success"
:disabled=
"isMakingRequest"
@
click=
"rebase"
>
<loading-icon
v-if=
"isMakingRequest"
/>
...
...
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