diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-17 15:08:01 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-10-17 15:08:01 +0100 |
| commit | b8fd2dddb29d0b3d2a117c7234e19ce25ced168c (patch) | |
| tree | 2e3e7028f113fed7e94fb135c33b0964387a693c | |
| parent | f7f6e0c07f6066d1c7d5d7d467e5200453e2a233 (diff) | |
| download | gitlab-ce-b8fd2dddb29d0b3d2a117c7234e19ce25ced168c.tar.gz | |
Changes after review
| -rw-r--r-- | app/views/projects/environments/_stop.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/environments/_stop.html.haml b/app/views/projects/environments/_stop.html.haml index 6ed6aee141b..ccda591590a 100644 --- a/app/views/projects/environments/_stop.html.haml +++ b/app/views/projects/environments/_stop.html.haml @@ -1,5 +1,5 @@ - if environment.available? && environment.stoppable? .inline = link_to stop_namespace_project_environment_path(@project.namespace, @project, environment), method: :post, - class: 'btn close-env-link', rel: 'nofollow', data: { confirm: 'Are you sure you want to close this environment?' } do + class: 'btn close-env-link', rel: 'nofollow', data: { confirm: 'Are you sure you want to stop this environment?' } do = icon('stop', class: 'close-env-icon') diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 70185176222..eeac6e3be1a 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -16,9 +16,9 @@ Stopped %span.badge.js-stopped-environments-count = number_with_delimiter(@all_environments.stopped.count) - - .nav-controls - - if can?(current_user, :create_environment, @project) && !@all_environments.blank? + + - if can?(current_user, :create_environment, @project) && !@all_environments.blank? + .nav-controls = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do New environment diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 3b4d0395db0..d765ddb97ce 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -14,7 +14,7 @@ - if can?(current_user, :update_environment, @environment) = link_to 'Edit', edit_namespace_project_environment_path(@project.namespace, @project, @environment), class: 'btn' - if @environment.available? && @environment.stoppable? - = link_to 'Stop', stop_namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to close this environment?' }, class: 'btn btn-danger', method: :post + = link_to 'Stop', stop_namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to stop this environment?' }, class: 'btn btn-danger', method: :post = link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to delete this environment?' }, class: 'btn btn-danger', method: :delete .deployments-container |