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
76119cb1
Commit
76119cb1
authored
Mar 28, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
b64555d3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
12 deletions
+7
-12
app/assets/javascripts/environments/components/environment_item.js
...s/javascripts/environments/components/environment_item.js
+4
-2
app/assets/javascripts/environments/components/environments_table.js
...javascripts/environments/components/environments_table.js
+1
-1
app/assets/javascripts/environments/services/environments_service.js
...javascripts/environments/services/environments_service.js
+2
-1
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+0
-8
No files found.
app/assets/javascripts/environments/components/environment_item.js
View file @
76119cb1
...
@@ -425,16 +425,18 @@ export default {
...
@@ -425,16 +425,18 @@ export default {
},
},
template
:
`
template
:
`
<tr
:class="{ 'child-row': model.isChildren }"
>
<tr>
<td>
<td>
<a v-if="!model.isFolder"
<a v-if="!model.isFolder"
class="environment-name"
class="environment-name"
:class="{ 'prepend-left-default': model.isChildren }"
:href="environmentPath">
:href="environmentPath">
{{model.name}}
{{model.name}}
</a>
</a>
<span v-else
<span v-else
class="folder-name"
class="folder-name"
@click="onClickFolder">
@click="onClickFolder"
role="button">
<span class="folder-icon">
<span class="folder-icon">
<i
<i
...
...
app/assets/javascripts/environments/components/environments_table.js
View file @
76119cb1
...
@@ -69,7 +69,7 @@ export default {
...
@@ -69,7 +69,7 @@ export default {
<template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0">
<template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0">
<tr v-if="isLoadingFolderContent">
<tr v-if="isLoadingFolderContent">
<td colspan="6" class="text-center">
<td colspan="6" class="text-center">
<i class="fa fa-spin fa-spinner" aria-hidden="true"/>
<i class="fa fa-spin fa-spinner
fa-2x
" aria-hidden="true"/>
</td>
</td>
</tr>
</tr>
...
...
app/assets/javascripts/environments/services/environments_service.js
View file @
76119cb1
...
@@ -18,6 +18,7 @@ export default class EnvironmentsService {
...
@@ -18,6 +18,7 @@ export default class EnvironmentsService {
}
}
getFolderContent
(
folderUrl
)
{
getFolderContent
(
folderUrl
)
{
return
Vue
.
http
.
get
(
`
${
folderUrl
}
.json?per_page=3`
);
const
results
=
3
;
return
Vue
.
http
.
get
(
`
${
folderUrl
}
.json?per_page=
${
results
}
`
);
}
}
}
}
app/assets/stylesheets/pages/environments.scss
View file @
76119cb1
...
@@ -54,14 +54,6 @@
...
@@ -54,14 +54,6 @@
}
}
}
}
.child-row
td
:first-child
a
{
margin-left
:
17px
;
}
.environments-show-all
{
text-align
:
center
;
}
.btn-group
{
.btn-group
{
>
a
{
>
a
{
...
...
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