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
593b6674
Commit
593b6674
authored
Jul 28, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'federkasten/gitlab-ce-fix-high-cpu-in-ff'
parents
67d5b95d
b72ce57d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/markdown_area.js.coffee
app/assets/javascripts/markdown_area.js.coffee
+15
-4
No files found.
CHANGELOG
View file @
593b6674
...
...
@@ -2,6 +2,7 @@ v 7.2.0
- Explore page
- Add project stars (Ciro Santilli)
- Log Sidekiq arguments
- Fix cpu usage issue in Firefox
v 7.1.0
- Remove observers
...
...
app/assets/javascripts/markdown_area.js.coffee
View file @
593b6674
...
...
@@ -20,6 +20,9 @@ $(document).ready ->
$
(
".div-dropzone-hover"
).
append
iconPicture
$
(
".div-dropzone"
).
append
divSpinner
$
(
".div-dropzone-spinner"
).
append
iconSpinner
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0
"display"
:
"none"
dropzone
=
$
(
".div-dropzone"
).
dropzone
(
url
:
project_image_path_upload
...
...
@@ -66,13 +69,17 @@ $(document).ready ->
return
sending
:
->
$
(
".div-dropzone-spinner"
).
css
"opacity"
,
0.7
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0.7
"display"
:
"inherit"
return
complete
:
->
$
(
".dz-preview"
).
remove
()
$
(
".markdown-area"
).
trigger
"input"
$
(
".div-dropzone-spinner"
).
css
"opacity"
,
0
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0
"display"
:
"none"
return
)
...
...
@@ -163,10 +170,14 @@ $(document).ready ->
val
+
url
+
"
\n
"
showSpinner
=
(
e
)
->
$
(
".div-dropzone-spinner"
).
css
"opacity"
,
0.7
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0.7
"display"
:
"inherit"
closeSpinner
=
->
$
(
".div-dropzone-spinner"
).
css
"opacity"
,
0
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0
"display"
:
"none"
showError
=
(
message
)
->
checkIfMsgExists
=
$
(
".error-alert"
).
children
().
length
...
...
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