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
74a84539
Commit
74a84539
authored
Jan 18, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
608d4cbb
49efb579
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
...avascripts/vue_shared/components/markdown/suggestions.vue
+1
-1
changelogs/unreleased/56389-remove-unwanted-suggestion-flash-margin.yml
...eleased/56389-remove-unwanted-suggestion-flash-margin.yml
+5
-0
spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
...cripts/vue_shared/components/markdown/suggestions_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
View file @
74a84539
...
...
@@ -129,7 +129,7 @@ export default {
<
template
>
<div>
<div
class=
"flash-container
mt-3
"
></div>
<div
class=
"flash-container
js-suggestions-flash
"
></div>
<div
v-show=
"isRendered"
ref=
"container"
v-html=
"noteHtml"
></div>
</div>
</
template
>
changelogs/unreleased/56389-remove-unwanted-suggestion-flash-margin.yml
0 → 100644
View file @
74a84539
---
title
:
Remove unwanted margin above suggested changes.
merge_request
:
24419
author
:
type
:
fixed
spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
View file @
74a84539
...
...
@@ -61,7 +61,7 @@ describe('Suggestion component', () => {
describe
(
'
mounted
'
,
()
=>
{
it
(
'
renders a flash container
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.
flash-container
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.
js-suggestions-flash
'
)).
not
.
toBeNull
();
});
it
(
'
renders a container for suggestions
'
,
()
=>
{
...
...
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