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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
672aec4a
Commit
672aec4a
authored
Jun 13, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved views
parent
4f00b93d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
46 deletions
+44
-46
app/views/projects/environments/_environment.html.haml
app/views/projects/environments/_environment.html.haml
+1
-3
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+13
-14
app/views/projects/environments/new.html.haml
app/views/projects/environments/new.html.haml
+12
-12
app/views/projects/environments/show.html.haml
app/views/projects/environments/show.html.haml
+18
-17
No files found.
app/views/projects/environments/_environment.html.haml
View file @
672aec4a
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%tr
.environment
%tr
.environment
%td
%td
%strong
%strong
=
link_to
environment
.
name
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
environment
)
,
class:
"monospace"
=
link_to
environment
.
name
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
environment
)
%td
%td
-
if
last_deployment
-
if
last_deployment
...
@@ -27,5 +27,3 @@
...
@@ -27,5 +27,3 @@
-
if
last_deployment
-
if
last_deployment
%p
%p
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
)
}
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
)
}
%td
app/views/projects/environments/index.html.haml
View file @
672aec4a
...
@@ -9,17 +9,16 @@
...
@@ -9,17 +9,16 @@
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
New environment
New environment
%ul
.content-list.environments
-
if
@environments
.
blank?
-
if
@environments
.
blank?
%ul
.content-list.environments
%li
%li
.nothing-here-block
.nothing-here-block
No environments to show
No environments to show
-
else
-
else
.table-holder
.table-holder
%table
.table
%table
.table
%tbody
%tbody
%th
Environment
%th
Environment
%th
Last deployment
%th
Last deployment
%th
Date
%th
Date
%th
-
@environments
.
each
do
|
environment
|
-
@environments
.
each
do
|
environment
|
=
render
'environment'
,
environment:
environment
=
render
'environment'
,
environment:
environment
app/views/projects/environments/new.html.haml
View file @
672aec4a
-
page_title
"New Environment"
-
page_title
"New Environment"
=
render
"projects/pipelines/head"
%h3
.page-title
.row.prepend-top-default.append-bottom-default
New Environment
.col-lg-3
%hr
%h4
.prepend-top-0
New Environment
=
form_for
@environment
,
url:
namespace_project_environments_path
(
@project
.
namespace
,
@project
),
html:
{
id:
"new-environment-form"
,
class:
"form-horizontal js-new-environment-form js-requires-input"
}
do
|
f
|
=
form_for
@environment
,
url:
namespace_project_environments_path
(
@project
.
namespace
,
@project
),
html:
{
id:
"new-environment-form"
,
class:
"col-lg-9 js-new-environment-form js-requires-input"
}
do
|
f
|
=
form_errors
(
@environment
)
=
form_errors
(
@environment
)
.form-group
.form-group
=
f
.
label
:ref
,
'Name'
,
class:
'control-label'
=
f
.
label
:ref
,
'Environment name'
,
class:
'label-light'
.col-sm-10
=
f
.
text_field
:name
,
required:
true
,
class:
'form-control'
=
f
.
text_field
:name
,
required:
true
,
tabindex:
2
,
class:
'form-control'
=
f
.
submit
'Create environment'
,
class:
'btn btn-create'
.form-actions
=
link_to
"Cancel"
,
namespace_project_environments_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-cancel"
=
f
.
submit
'Create'
,
class:
'btn btn-create'
,
tabindex:
3
=
link_to
'Cancel'
,
namespace_project_environments_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-cancel'
app/views/projects/environments/show.html.haml
View file @
672aec4a
...
@@ -9,23 +9,24 @@
...
@@ -9,23 +9,24 @@
.col-md-3
.col-md-3
.nav-controls
.nav-controls
=
link_to
'Destroy'
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
@environment
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :
post
=
link_to
'Destroy'
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
@environment
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :
delete
%ul
.content-list
-
if
@deployments
.
blank?
-
if
@deployments
.
blank?
%ul
.content-list
%li
%li
.nothing-here-block
.nothing-here-block
No deployments for
#{
@environment
.
name
}
No deployments for
-
else
%strong
=
@environment
.
name
.table-holder
-
else
%table
.table.builds
.table-holder
%thead
%table
.table.builds
%tr
%thead
%th
ID
%tr
%th
Commit
%th
ID
%th
Build
%th
Commit
%th
Date
%th
Build
%th
%th
Date
%th
=
render
@deployments
=
render
@deployments
=
paginate
@deployments
,
theme:
'gitlab'
=
paginate
@deployments
,
theme:
'gitlab'
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