summaryrefslogtreecommitdiff
path: root/app/views/projects/environments
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 14:43:45 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 14:43:45 +0200
commitbb6f246790fb3a6b85ab2fd9341566557da64a23 (patch)
treef215918327d82cc629f8faba6deeebffef92cb3e /app/views/projects/environments
parente129f66d9e597f43f7a85243ddedf3de0fc4946a (diff)
downloadgitlab-ce-bb6f246790fb3a6b85ab2fd9341566557da64a23.tar.gz
Authorize environments controller actions
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r--app/views/projects/environments/new.html.haml2
-rw-r--r--app/views/projects/environments/show.html.haml3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/environments/new.html.haml b/app/views/projects/environments/new.html.haml
index c7abac6e49f..ade41d9de2d 100644
--- a/app/views/projects/environments/new.html.haml
+++ b/app/views/projects/environments/new.html.haml
@@ -9,7 +9,7 @@
= 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-group
- = f.label :ref, 'Environment name', class: 'label-light'
+ = f.label :name, 'Environment name', class: 'label-light'
= f.text_field :name, required: true, class: 'form-control'
= f.submit 'Create environment', class: 'btn btn-create'
= link_to "Cancel", namespace_project_environments_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index f5e30d75b42..1d39bef9427 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -9,7 +9,8 @@
.col-md-3
.nav-controls
- = link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :delete
+ - if can?(current_user, :update_environment, @project)
+ = link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :delete
- if @deployments.blank?
%ul.content-list