Add latest changes from gitlab-org/gitlab@12-6-stable-ee

4 files changed, 32 insertions, 18 deletions

diff --git a/app/views/projects/settings/_archive.html.haml b/app/views/projects/settings/_archive.html.haml
new file mode 100644
index 00000000000..3307c3775ec
--- /dev/null
+++ b/app/views/projects/settings/_archive.html.haml
@@ -0,0 +1,18 @@
+- return unless can?(current_user, :archive_project, @project)
+
+.sub-section
+  %h4.warning-title
+    - if @project.archived?
+      = _('Unarchive project')
+    - else
+      = _('Archive project')
+  - if @project.archived?
+    %p= _("Unarchiving the project will restore people's ability to make changes to it. The repository can be committed to, and issues, comments, and other entities can be created. %{strong_start}Once active, this project shows up in the search and on the dashboard.%{strong_end}").html_safe % { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
+    = link_to _('Unarchive project'), unarchive_project_path(@project),
+        data: { confirm: _("Are you sure that you want to unarchive this project?"), qa_selector: 'unarchive_project_link' },
+        method: :post, class: "btn btn-success"
+  - else
+    %p= _("Archiving the project will make it entirely read only. It is hidden from the dashboard and doesn't show up in searches. %{strong_start}The repository cannot be committed to, and no issues, comments, or other entities can be created.%{strong_end}").html_safe % { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
+    = link_to _('Archive project'), archive_project_path(@project),
+        data: { confirm: _("Are you sure that you want to archive this project?"), qa_selector: 'archive_project_link' },
+        method: :post, class: "btn btn-warning"
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml
index ea815be23c1..a72179f40ad 100644
--- a/app/views/projects/settings/ci_cd/_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_form.html.haml
@@ -55,7 +55,7 @@
           = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
           %p.form-text.text-muted
             = _("The path to the CI configuration file. Defaults to <code>.gitlab-ci.yml</code>").html_safe
-            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank'
+            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
 
         %hr
         .form-group
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 862db23e856..38483f599b7 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -55,6 +55,18 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _("Triggers can force a specific branch or tag to get rebuilt with an API call.  These tokens will impersonate their associated user including their access to projects and their project permissions.")
+      = _("Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions.")
   .settings-content
     = render 'projects/triggers/index'
+
+- if Feature.enabled?(:registry_retention_policies_settings, @project)
+  %section.settings.no-animate#js-registry-polcies{ class: ('expanded' if expanded) }
+    .settings-header
+      %h4
+        = _("Container Registry tag expiration policies")
+      %button.btn.js-settings-toggle{ type: 'button' }
+        = expanded ? _('Collapse') : _('Expand')
+      %p
+        = _("Expiration policies for the Container Registry are a perfect solution for keeping the Registry space down while still enjoying the full power of GitLab CI/CD.")
+    .settings-content
+      = render 'projects/registry/settings/index'
diff --git a/app/views/projects/settings/integrations/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml
deleted file mode 100644
index ef445f2e139..00000000000
--- a/app/views/projects/settings/integrations/_project_hook.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-%li
-  .row
-    .col-md-8.col-lg-7
-      %strong.light-header= hook.url
-      %div
-        - ProjectHook.triggers.each_value do |event|
-          - if hook.public_send(event)
-            %span.badge.badge-gray.deploy-project-label= event.to_s.titleize
-    .col-md-4.col-lg-5.text-right-lg.prepend-top-5
-      %span.append-right-10.inline
-        #{_("SSL Verification")}: #{hook.enable_ssl_verification ? _('enabled') : _('disabled')}
-      = link_to _('Edit'), edit_project_hook_path(@project, hook), class: 'btn btn-sm'
-      = render 'shared/web_hooks/test_button', triggers: ProjectHook.triggers, hook: hook, button_class: 'btn-sm'
-      = link_to project_hook_path(@project, hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn btn-transparent' do
-        %span.sr-only= _("Remove")
-        = icon('trash')