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
7435c5d4
Commit
7435c5d4
authored
Aug 07, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix loading.
parent
aac0bc09
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
app/assets/javascripts/repo/components/repo_loading_file.vue
app/assets/javascripts/repo/components/repo_loading_file.vue
+1
-1
app/assets/javascripts/repo/helpers/repo_helper.js
app/assets/javascripts/repo/helpers/repo_helper.js
+9
-3
app/assets/javascripts/repo/services/repo_service.js
app/assets/javascripts/repo/services/repo_service.js
+1
-1
No files found.
app/assets/javascripts/repo/components/repo_loading_file.vue
View file @
7435c5d4
...
...
@@ -29,7 +29,7 @@ export default RepoLoadingFile;
</
script
>
<
template
>
<tr
v-if=
"
loading.tree &&
!hasFiles"
class=
"loading-file"
>
<tr
v-if=
"!hasFiles"
class=
"loading-file"
>
<td>
<div
class=
"animation-container animation-container-small"
>
<div
v-for=
"n in 6"
:class=
"lineOfCode(n)"
:key=
"n"
></div>
...
...
app/assets/javascripts/repo/helpers/repo_helper.js
View file @
7435c5d4
...
...
@@ -216,15 +216,21 @@ const RepoHelper = {
serializeRepoEntity
(
type
,
entity
)
{
const
{
url
,
name
,
icon
,
last_commit
}
=
entity
;
return
{
let
returnObj
=
{
type
,
name
,
url
,
lastCommitUrl
:
`
${
Store
.
projectUrl
}
/commit/
${
last_commit
.
id
}
`
,
icon
:
RepoHelper
.
toFA
(
icon
),
level
:
0
,
loading
:
false
,
};
if
(
entity
.
last_commit
){
returnObj
.
lastCommitUrl
=
`
${
Store
.
projectUrl
}
/commit/
${
last_commit
.
id
}
`
;
}
else
{
returnObj
.
lastCommitUrl
=
''
;
}
return
returnObj
;
},
scrollTabsRight
()
{
...
...
@@ -283,7 +289,7 @@ const RepoHelper = {
return
Store
.
openedFiles
.
find
(
openedFile
=>
Store
.
activeFile
.
url
===
openedFile
.
url
);
},
loadingError
()
{
loadingError
(
e
)
{
Flash
(
'
Unable to load the file at this time.
'
);
},
};
...
...
app/assets/javascripts/repo/services/repo_service.js
View file @
7435c5d4
...
...
@@ -63,7 +63,7 @@ const RepoService = {
blobURLtoParentTree
(
url
)
{
const
urlArray
=
url
.
split
(
'
/
'
);
urlArray
.
pop
();
const
blobIndex
=
urlArray
.
i
ndexOf
(
'
blob
'
);
const
blobIndex
=
urlArray
.
lastI
ndexOf
(
'
blob
'
);
if
(
blobIndex
>
-
1
)
urlArray
[
blobIndex
]
=
'
tree
'
;
...
...
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