Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 1 insertions, 35 deletions

diff --git a/app/views/projects/registry/repositories/_tag.html.haml b/app/views/projects/registry/repositories/_tag.html.haml
deleted file mode 100644
index 9594c9184a2..00000000000
--- a/app/views/projects/registry/repositories/_tag.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-%tr.tag
-  %td
-    = escape_once(tag.name)
-    = clipboard_button(text: "#{tag.location}")
-  %td
-    - if tag.revision
-      %span.has-tooltip{ title: "#{tag.revision}" }
-        = tag.short_revision
-    - else
-      \-
-  %td
-    - if tag.total_size
-      = number_to_human_size(tag.total_size)
-      ·
-      = pluralize(tag.layers.size, "layer")
-    - else
-      .light
-        \-
-  %td
-    - if tag.created_at
-      = time_ago_with_tooltip tag.created_at
-    - else
-      .light
-        \-
-  - if can?(current_user, :update_container_image, @project)
-    %td.content
-      .controls.d-none.d-sm-block.float-right
-        = link_to project_registry_repository_tag_path(@project, tag.repository, tag.name),
-                  method: :delete,
-                  class: 'btn btn-remove has-tooltip',
-                  title: 'Remove tag',
-                  data: { confirm: 'Are you sure you want to delete this tag?' } do
-          = icon('trash cred')
diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index 650e63eb406..8540ce30060 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -5,7 +5,6 @@
   .row.registry-placeholder.prepend-bottom-10
     .col-12
       #js-container-registry{ data: { endpoint: project_container_registry_index_path(@project),
-        settings_path: project_settings_ci_cd_path(@project),
         expiration_policy: @project.container_expiration_policy.to_json,
         "help_page_path" => help_page_path('user/packages/container_registry/index'),
         "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'),
@@ -16,5 +15,5 @@
         "registry_host_url_with_port" => escape_once(registry_config.host_port),
         "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'),
         "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
-        "is_admin": current_user&.admin,
+        "is_admin": current_user&.admin.to_s,
         character_error: @character_error.to_s } }