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
8401ec56
Commit
8401ec56
authored
Jun 20, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show spinner when loading MR diff
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
995d193d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+2
-2
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-1
No files found.
app/assets/javascripts/merge_request.js.coffee
View file @
8401ec56
...
@@ -109,10 +109,10 @@ class MergeRequest
...
@@ -109,10 +109,10 @@ class MergeRequest
type
:
'GET'
type
:
'GET'
url
:
this
.
$
(
'.merge-request-tabs .diffs-tab a'
).
attr
(
'href'
)
url
:
this
.
$
(
'.merge-request-tabs .diffs-tab a'
).
attr
(
'href'
)
beforeSend
:
=>
beforeSend
:
=>
this
.
$
(
'.
status'
).
addClass
'loading'
this
.
$
(
'.
mr-loading-status .loading'
).
show
()
complete
:
=>
complete
:
=>
@
diffs_loaded
=
true
@
diffs_loaded
=
true
this
.
$
(
'.
status'
).
removeClass
'loading'
this
.
$
(
'.
mr-loading-status .loading'
).
hide
()
success
:
(
data
)
=>
success
:
(
data
)
=>
this
.
$
(
".diffs"
).
html
(
data
.
html
)
this
.
$
(
".diffs"
).
html
(
data
.
html
)
dataType
:
'json'
dataType
:
'json'
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
8401ec56
...
@@ -31,7 +31,8 @@
...
@@ -31,7 +31,8 @@
=
render
"projects/merge_requests/show/diffs"
=
render
"projects/merge_requests/show/diffs"
.notes.tab-content.voting_notes
#notes
{
class:
(
controller
.
action_name
==
'show'
)
?
""
:
"hide"
}
.notes.tab-content.voting_notes
#notes
{
class:
(
controller
.
action_name
==
'show'
)
?
""
:
"hide"
}
=
render
"projects/notes/notes_with_form"
=
render
"projects/notes/notes_with_form"
.status
.mr-loading-status
=
spinner
:javascript
:javascript
var
merge_request
;
var
merge_request
;
...
...
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