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
Boxiang Sun
gitlab-ce
Commits
52028171
Commit
52028171
authored
Apr 20, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix user uploads file spec
parent
ee5b4708
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+3
-3
app/views/shared/notes/_hints.html.haml
app/views/shared/notes/_hints.html.haml
+3
-3
No files found.
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
52028171
...
...
@@ -59,7 +59,7 @@
v-if=
"canAttachFile"
class=
"uploading-container"
>
<span
class=
"uploading-progress-container
d-non
e"
>
<span
class=
"uploading-progress-container
hid
e"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
...
...
@@ -75,7 +75,7 @@
</i>
</span>
</span>
<span
class=
"uploading-error-container
d-non
e"
>
<span
class=
"uploading-error-container
hid
e"
>
<span
class=
"uploading-error-icon"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
...
...
@@ -111,7 +111,7 @@
Attach a file
</button>
<button
class=
"btn btn-secondary btn-sm
d-non
e button-cancel-uploading-files"
class=
"btn btn-secondary btn-sm
hid
e button-cancel-uploading-files"
type=
"button"
>
Cancel
...
...
app/views/shared/notes/_hints.html.haml
View file @
52028171
...
...
@@ -11,7 +11,7 @@
supported
%span
.uploading-container
%span
.uploading-progress-container.
d-non
e
%span
.uploading-progress-container.
hid
e
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
%span
.attaching-file-message
-# Populated by app/assets/javascripts/dropzone_input.js
...
...
@@ -19,7 +19,7 @@
%span
.uploading-spinner
=
icon
(
'spinner spin'
,
class:
'toolbar-button-icon'
)
%span
.uploading-error-container.
d-non
e
%span
.uploading-error-container.
hid
e
%span
.uploading-error-icon
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
%span
.uploading-error-message
...
...
@@ -32,4 +32,4 @@
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
Attach a file
%button
.btn.btn-secondary.btn-sm.
d-non
e.button-cancel-uploading-files
{
type:
'button'
}
Cancel
%button
.btn.btn-secondary.btn-sm.
hid
e.button-cancel-uploading-files
{
type:
'button'
}
Cancel
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