Add latest changes from gitlab-org/gitlab@master

3 files changed, 76 insertions, 69 deletions

diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 51b0b2722d1..b67f9d0cd08 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -23,7 +23,7 @@
         .js-suggest-gitlab-ci-yml{ data: { toggle: 'popover',
           target: '#gitlab-ci-yml-selector',
           track_label: 'suggest_gitlab_ci_yml',
-          dismiss_key: "suggest_gitlab_ci_yml_#{@project.id}",
+          dismiss_key: @project.id,
           human_access: human_access } }
 
     .file-buttons
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 1afbe1fe24e..8f166e9aa16 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -17,5 +17,5 @@
       .js-suggest-gitlab-ci-yml-commit-changes{ data: { toggle: 'popover',
         target: '#commit-changes',
         track_label: 'suggest_commit_first_project_gitlab_ci_yml',
-        dismiss_key: "suggest_commit_first_project_gitlab_ci_yml_#{@project.id}",
+        dismiss_key: @project.id,
         human_access: human_access } }
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index ff78abfddf4..3a7a93dc4e6 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -5,74 +5,81 @@
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag 'page_bundles/xterm'
 
-- if @environment.available? && can?(current_user, :stop_environment, @environment)
-  #stop-environment-modal.modal.fade{ tabindex: -1 }
-    .modal-dialog
-      .modal-content
-        .modal-header
-          %h4.modal-title.d-flex.mw-100
-            = s_("Environments|Stopping")
-            %span.has-tooltip.text-truncate.ml-1.mr-1.flex-fill{ title: @environment.name, data: { container: '#stop-environment-modal' } }
-              = @environment.name
-            ?
-        .modal-body
-          %p= s_('Environments|Are you sure you want to stop this environment?')
-          - unless @environment.stop_action_available?
-            .warning_message
-              %p= s_('Environments|Note that this action will stop the environment, but it will %{emphasis_start}not%{emphasis_end} have an effect on any existing deployment due to no “stop environment action” being defined in the %{ci_config_link_start}.gitlab-ci.yml%{ci_config_link_end} file.').html_safe % { emphasis_start: '<strong>'.html_safe,
-                emphasis_end: '</strong>'.html_safe,
-                ci_config_link_start: '<a href="https://docs.gitlab.com/ee/ci/yaml/" target="_blank" rel="noopener noreferrer">'.html_safe,
-                ci_config_link_end: '</a>'.html_safe }
-              %a{ href: 'https://docs.gitlab.com/ee/ci/environments.html#stopping-an-environment',
-                target: '_blank',
-                rel: 'noopener noreferrer' }
-                = s_('Environments|Learn more about stopping environments')
-        .modal-footer
-          = button_tag _('Cancel'), type: 'button', class: 'btn btn-cancel', data: { dismiss: 'modal' }
-          = button_to stop_project_environment_path(@project, @environment), class: 'btn btn-danger has-tooltip', method: :post do
-            = s_('Environments|Stop environment')
+#environments-detail-view{ data: { name: @environment.name, id: @environment.id, delete_path: environment_delete_path(@environment)} }
+  - if @environment.available? && can?(current_user, :stop_environment, @environment)
+    #stop-environment-modal.modal.fade{ tabindex: -1 }
+      .modal-dialog
+        .modal-content
+          .modal-header
+            %h4.modal-title.d-flex.mw-100
+              = s_("Environments|Stopping")
+              %span.has-tooltip.text-truncate.ml-1.mr-1.flex-fill{ title: @environment.name, data: { container: '#stop-environment-modal' } }
+                #{@environment.name}?
+          .modal-body
+            %p= s_('Environments|Are you sure you want to stop this environment?')
+            - unless @environment.stop_action_available?
+              .warning_message
+                %p= s_('Environments|Note that this action will stop the environment, but it will %{emphasis_start}not%{emphasis_end} have an effect on any existing deployment due to no “stop environment action” being defined in the %{ci_config_link_start}.gitlab-ci.yml%{ci_config_link_end} file.').html_safe % { emphasis_start: '<strong>'.html_safe,
+                  emphasis_end: '</strong>'.html_safe,
+                  ci_config_link_start: '<a href="https://docs.gitlab.com/ee/ci/yaml/" target="_blank" rel="noopener noreferrer">'.html_safe,
+                  ci_config_link_end: '</a>'.html_safe }
+                %a{ href: 'https://docs.gitlab.com/ee/ci/environments.html#stopping-an-environment',
+                  target: '_blank',
+                  rel: 'noopener noreferrer' }
+                  = s_('Environments|Learn more about stopping environments')
+          .modal-footer
+            = button_tag _('Cancel'), type: 'button', class: 'btn btn-cancel', data: { dismiss: 'modal' }
+            = button_to stop_project_environment_path(@project, @environment), class: 'btn btn-danger has-tooltip', method: :post do
+              = s_('Environments|Stop environment')
 
-.top-area.justify-content-between
-  .d-flex
-    %h3.page-title= @environment.name
-    - if @environment.auto_stop_at?
-      %p.align-self-end.prepend-left-8
-        = s_('Environments|Auto stops %{auto_stop_time}').html_safe % {auto_stop_time: time_ago_with_tooltip(@environment.auto_stop_at)}
-  .nav-controls.my-2
-    = render 'projects/environments/pin_button', environment: @environment
-    = render 'projects/environments/terminal_button', environment: @environment
-    = render 'projects/environments/external_url', environment: @environment
-    = render 'projects/environments/metrics_button', environment: @environment
-    - if can?(current_user, :update_environment, @environment)
-      = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn'
-    - if @environment.available? && can?(current_user, :stop_environment, @environment)
-      = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal',
-        target: '#stop-environment-modal' } do
-        = sprite_icon('stop')
-        = s_('Environments|Stop')
+  - if can_destroy_environment?(@environment)
+    #delete-environment-modal
 
-.environments-container
-  - if @deployments.blank?
-    .empty-state
-      .text-content
-        %h4.state-title
-          = _("You don't have any deployments right now.")
-        %p.blank-state-text
-          = _("Define environments in the deploy stage(s) in <code>.gitlab-ci.yml</code> to track deployments here.").html_safe
-        .text-center
-          = link_to _("Read more"), help_page_path("ci/environments"), class: "btn btn-success"
-  - else
-    .table-holder
-      .ci-table.environments{ role: 'grid' }
-        .gl-responsive-table-row.table-row-header{ role: 'row' }
-          .table-section.section-15{ role: 'columnheader' }= _('Status')
-          .table-section.section-10{ role: 'columnheader' }= _('ID')
-          .table-section.section-10{ role: 'columnheader' }= _('Triggerer')
-          .table-section.section-25{ role: 'columnheader' }= _('Commit')
-          .table-section.section-10{ role: 'columnheader' }= _('Job')
-          .table-section.section-10{ role: 'columnheader' }= _('Created')
-          .table-section.section-10{ role: 'columnheader' }= _('Deployed')
+  .top-area.justify-content-between
+    .d-flex
+      %h3.page-title= @environment.name
+      - if @environment.auto_stop_at?
+        %p.align-self-end.prepend-left-8
+          = s_('Environments|Auto stops %{auto_stop_time}').html_safe % {auto_stop_time: time_ago_with_tooltip(@environment.auto_stop_at)}
+    .nav-controls.my-2
+      = render 'projects/environments/pin_button', environment: @environment
+      = render 'projects/environments/terminal_button', environment: @environment
+      = render 'projects/environments/external_url', environment: @environment
+      = render 'projects/environments/metrics_button', environment: @environment
+      - if can?(current_user, :update_environment, @environment)
+        = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn'
+      - if @environment.available? && can?(current_user, :stop_environment, @environment)
+        = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal',
+          target: '#stop-environment-modal' } do
+          = sprite_icon('stop')
+          = s_('Environments|Stop')
+      - if can_destroy_environment?(@environment)
+        = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal',
+          target: '#delete-environment-modal' } do
+          = s_('Environments|Delete')
 
-        = render @deployments
+  .environments-container
+    - if @deployments.blank?
+      .empty-state
+        .text-content
+          %h4.state-title
+            = _("You don't have any deployments right now.")
+          %p.blank-state-text
+            = _("Define environments in the deploy stage(s) in <code>.gitlab-ci.yml</code> to track deployments here.").html_safe
+          .text-center
+            = link_to _("Read more"), help_page_path("ci/environments"), class: "btn btn-success"
+    - else
+      .table-holder
+        .ci-table.environments{ role: 'grid' }
+          .gl-responsive-table-row.table-row-header{ role: 'row' }
+            .table-section.section-15{ role: 'columnheader' }= _('Status')
+            .table-section.section-10{ role: 'columnheader' }= _('ID')
+            .table-section.section-10{ role: 'columnheader' }= _('Triggerer')
+            .table-section.section-25{ role: 'columnheader' }= _('Commit')
+            .table-section.section-10{ role: 'columnheader' }= _('Job')
+            .table-section.section-10{ role: 'columnheader' }= _('Created')
+            .table-section.section-10{ role: 'columnheader' }= _('Deployed')
 
-    = paginate @deployments, theme: 'gitlab'
+          = render @deployments
+
+      = paginate @deployments, theme: 'gitlab'