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
Tatuya Kamada
gitlab-ce
Commits
96152f17
Commit
96152f17
authored
Oct 20, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds # back to deployment id
parent
3265518b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
20 deletions
+27
-20
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+18
-13
app/views/projects/environments/components/_environment.html.haml
...s/projects/environments/components/_environment.html.haml
+9
-7
No files found.
app/assets/stylesheets/pages/environments.scss
View file @
96152f17
...
@@ -4,6 +4,11 @@
...
@@ -4,6 +4,11 @@
overflow
:
auto
;
overflow
:
auto
;
}
}
.environments-list-loading
{
width
:
100%
;
font-size
:
34px
;
}
.environments
{
.environments
{
.deployment-column
{
.deployment-column
{
.avatar
{
.avatar
{
...
@@ -58,14 +63,23 @@
...
@@ -58,14 +63,23 @@
}
}
}
}
}
}
.children-name
{
margin-left
:
17px
;
margin-right
:
-17px
;
}
.folder-icon
{
padding
:
0
5px
0
0
;
}
.folder-name
{
cursor
:
pointer
;
}
}
}
.table.ci-table.environments
{
.table.ci-table.environments
{
.environment-children
td
:first-child
{
padding-left
:
40px
;
}
.icon-container
{
.icon-container
{
width
:
20px
;
width
:
20px
;
text-align
:
center
;
text-align
:
center
;
...
@@ -76,13 +90,4 @@
...
@@ -76,13 +90,4 @@
margin-right
:
0
;
margin-right
:
0
;
}
}
}
}
.environment-folder-name
{
cursor
:
pointer
;
}
}
.environments-list-loading
{
width
:
100%
;
font-size
:
34px
;
}
}
app/views/projects/environments/components/_environment.html.haml
View file @
96152f17
%script
#environment-item-template
{
"type"
=>
"text/x-template"
}
%script
#environment-item-template
{
"type"
=>
"text/x-template"
}
%tr
.environment
%tr
.environment
%td
.
environment-
folder-name
{
"@click"
=>
"toggle"
}
%td
.folder-name
{
"@click"
=>
"toggle"
}
%a
{
"v-if"
=>
"!isFolder"
,
%a
{
"v-if"
=>
"!isFolder"
,
":href"
=>
"'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id"
}
":href"
=>
"'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id"
}
{{model.name}}
{{model.name}}
%span
{
"v-if"
=>
"isFolder"
}
%span
{
"v-if"
=>
"isFolder"
}
%i
{
"v-show"
=>
"open"
}
%i
.folder-icon
{
"v-show"
=>
"open"
}
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
%i
{
"v-show"
=>
"!open"
}
%i
.folder-icon
{
"v-show"
=>
"!open"
}
=
icon
(
"caret-right"
)
=
icon
(
"caret-right"
)
{{model.name}}
{{model.name}}
%td
.deployment-column
%td
.deployment-column
%span
{
"v-if"
=>
"!isFolder && model.last_deployment && model.last_deployment.iid"
}
%span
{
"v-if"
=>
"!isFolder && model.last_deployment && model.last_deployment.iid"
}
{{model.last_deployment.iid}}
=
precede
'#'
do
{{model.last_deployment.iid}}
%span
{
"v-if"
=>
"model.last_deployment.user"
}
%span
{
"v-if"
=>
"model.last_deployment.user"
}
by
by
...
@@ -52,18 +53,19 @@
...
@@ -52,18 +53,19 @@
-# = render "projects/environments/stop", environment: "{{model}}"
-# = render "projects/environments/stop", environment: "{{model}}"
-# = render "projects/deployments/rollback", deployment: "{{model.last_deployment}}"
-# = render "projects/deployments/rollback", deployment: "{{model.last_deployment}}"
%tr
.environment-children
{
"v-show"
=>
"open"
,
%tr
{
"v-show"
=>
"open"
,
"v-if"
=>
"isFolder"
,
"v-if"
=>
"isFolder"
,
"v-for"
=>
"child in model.children"
,
"v-for"
=>
"child in model.children"
,
":model"
=>
"child"
}
":model"
=>
"child"
}
%td
%td
%a
{
":href"
=>
"'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id"
}
%a
.children-name
{
":href"
=>
"'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id"
}
{{child.name}}
{{child.name}}
%td
.deployment-column
%td
.deployment-column
%span
{
"v-if"
=>
"child.last_deployment && child.last_deployment.iid"
}
%span
{
"v-if"
=>
"child.last_deployment && child.last_deployment.iid"
}
{{child.last_deployment.iid}}
=
precede
'#'
do
{{child.last_deployment.iid}}
%span
{
"v-if"
=>
"child.last_deployment.user"
}
%span
{
"v-if"
=>
"child.last_deployment.user"
}
by
by
...
...
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