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
fa9e729a
Commit
fa9e729a
authored
Oct 16, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed rendering bugs
fixed eslint
parent
5f80d042
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
18 deletions
+7
-18
app/assets/javascripts/repo/components/repo_file.vue
app/assets/javascripts/repo/components/repo_file.vue
+2
-1
app/assets/javascripts/repo/components/repo_prev_directory.vue
...ssets/javascripts/repo/components/repo_prev_directory.vue
+1
-1
app/assets/javascripts/repo/components/repo_sidebar.vue
app/assets/javascripts/repo/components/repo_sidebar.vue
+1
-1
app/assets/javascripts/repo/helpers/repo_helper.js
app/assets/javascripts/repo/helpers/repo_helper.js
+1
-1
app/assets/javascripts/repo/stores/repo_store.js
app/assets/javascripts/repo/stores/repo_store.js
+1
-14
spec/javascripts/repo/mock_data.js
spec/javascripts/repo/mock_data.js
+1
-0
No files found.
app/assets/javascripts/repo/components/repo_file.vue
View file @
fa9e729a
...
@@ -58,10 +58,11 @@
...
@@ -58,10 +58,11 @@
</td>
</td>
<template
v-if=
"!isMini"
>
<template
v-if=
"!isMini"
>
<td
class=
"
commit-message
hidden-sm hidden-xs"
>
<td
class=
"hidden-sm hidden-xs"
>
<a
<a
@
click
.
stop
@
click
.
stop
:href=
"file.lastCommit.url"
:href=
"file.lastCommit.url"
class=
"commit-message"
>
>
{{
file
.
lastCommit
.
message
}}
{{
file
.
lastCommit
.
message
}}
</a>
</a>
...
...
app/assets/javascripts/repo/components/repo_prev_directory.vue
View file @
fa9e729a
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
</
script
>
</
script
>
<
template
>
<
template
>
<tr
class=
"prev-directory"
>
<tr
class=
"
file
prev-directory"
>
<td
<td
:colspan=
"colSpanCondition"
:colspan=
"colSpanCondition"
class=
"table-cell"
class=
"table-cell"
...
...
app/assets/javascripts/repo/components/repo_sidebar.vue
View file @
fa9e729a
...
@@ -136,7 +136,7 @@ export default {
...
@@ -136,7 +136,7 @@ export default {
</thead>
</thead>
<tbody>
<tbody>
<repo-previous-directory
<repo-previous-directory
v-if=
"!isRoot"
v-if=
"!isRoot
&& !loading.tree
"
:prev-url=
"prevURL"
:prev-url=
"prevURL"
/>
/>
<repo-loading-file
<repo-loading-file
...
...
app/assets/javascripts/repo/helpers/repo_helper.js
View file @
fa9e729a
...
@@ -94,7 +94,7 @@ const RepoHelper = {
...
@@ -94,7 +94,7 @@ const RepoHelper = {
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
const
data
=
response
.
data
;
const
data
=
response
.
data
;
if
(
response
.
headers
&&
response
.
headers
[
'
page-title
'
])
data
.
pageTitle
=
response
.
headers
[
'
page-title
'
];
if
(
response
.
headers
&&
response
.
headers
[
'
page-title
'
])
data
.
pageTitle
=
response
.
headers
[
'
page-title
'
];
if
(
response
.
headers
&&
response
.
headers
[
'
is-root
'
])
Store
.
isRoot
=
convertPermissionToBoolean
(
response
.
headers
[
'
is-root
'
]);
if
(
response
.
headers
&&
response
.
headers
[
'
is-root
'
]
&&
Store
.
isRoot
===
null
)
Store
.
isRoot
=
convertPermissionToBoolean
(
response
.
headers
[
'
is-root
'
]);
if
(
file
&&
file
.
type
===
'
blob
'
)
{
if
(
file
&&
file
.
type
===
'
blob
'
)
{
if
(
!
file
)
file
=
data
;
if
(
!
file
)
file
=
data
;
...
...
app/assets/javascripts/repo/stores/repo_store.js
View file @
fa9e729a
...
@@ -2,13 +2,12 @@ import Helper from '../helpers/repo_helper';
...
@@ -2,13 +2,12 @@ import Helper from '../helpers/repo_helper';
import
Service
from
'
../services/repo_service
'
;
import
Service
from
'
../services/repo_service
'
;
const
RepoStore
=
{
const
RepoStore
=
{
monaco
:
{},
monacoLoading
:
false
,
monacoLoading
:
false
,
service
:
''
,
service
:
''
,
canCommit
:
false
,
canCommit
:
false
,
onTopOfBranch
:
false
,
onTopOfBranch
:
false
,
editMode
:
false
,
editMode
:
false
,
isRoot
:
false
,
isRoot
:
null
,
prevURL
:
''
,
prevURL
:
''
,
projectId
:
''
,
projectId
:
''
,
projectName
:
''
,
projectName
:
''
,
...
@@ -38,23 +37,11 @@ const RepoStore = {
...
@@ -38,23 +37,11 @@ const RepoStore = {
newMrTemplateUrl
:
''
,
newMrTemplateUrl
:
''
,
branchChanged
:
false
,
branchChanged
:
false
,
commitMessage
:
''
,
commitMessage
:
''
,
binaryTypes
:
{
png
:
false
,
md
:
false
,
svg
:
false
,
unknown
:
false
,
},
loading
:
{
loading
:
{
tree
:
false
,
tree
:
false
,
blob
:
false
,
blob
:
false
,
},
},
resetBinaryTypes
()
{
Object
.
keys
(
RepoStore
.
binaryTypes
).
forEach
((
key
)
=>
{
RepoStore
.
binaryTypes
[
key
]
=
false
;
});
},
setBranchHash
()
{
setBranchHash
()
{
return
Service
.
getBranch
()
return
Service
.
getBranch
()
.
then
((
data
)
=>
{
.
then
((
data
)
=>
{
...
...
spec/javascripts/repo/mock_data.js
View file @
fa9e729a
import
RepoHelper
from
'
~/repo/helpers/repo_helper
'
;
import
RepoHelper
from
'
~/repo/helpers/repo_helper
'
;
// eslint-disable-next-line import/prefer-default-export
export
const
file
=
()
=>
RepoHelper
.
serializeBlob
({
export
const
file
=
()
=>
RepoHelper
.
serializeBlob
({
icon
:
'
icon
'
,
icon
:
'
icon
'
,
url
:
'
url
'
,
url
:
'
url
'
,
...
...
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