Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953

4 files changed, 14 insertions, 49 deletions

diff --git a/app/views/clusters/clusters/_form.html.haml b/app/views/clusters/clusters/_form.html.haml
index 455322b2089..3d0266a2d5b 100644
--- a/app/views/clusters/clusters/_form.html.haml
+++ b/app/views/clusters/clusters/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field|
+= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_integration_form' } do |field|
   = form_errors(@cluster)
   .form-group
     %h5= s_('ClusterIntegration|Integration status')
diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml
index e12748666c8..db1849ebb45 100644
--- a/app/views/groups/settings/_general.html.haml
+++ b/app/views/groups/settings/_general.html.haml
@@ -13,7 +13,7 @@
         = f.text_field :id, class: 'form-control w-auto', readonly: true
 
     .row.prepend-top-8
-      .form-group.col-md-9.append-bottom-0
+      .form-group.col-md-9
         = f.label :description, _('Group description (optional)'), class: 'label-bold'
         = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
 
diff --git a/app/views/projects/deploy_tokens/_form.html.haml b/app/views/projects/deploy_tokens/_form.html.haml
index 5412fcbc9d8..f846dbd3763 100644
--- a/app/views/projects/deploy_tokens/_form.html.haml
+++ b/app/views/projects/deploy_tokens/_form.html.haml
@@ -13,6 +13,11 @@
     = f.text_field :expires_at, class: 'datepicker form-control qa-deploy-token-expires-at', value: f.object.expires_at
 
   .form-group
+    = f.label :username, class: 'label-bold'
+    = f.text_field :username, class: 'form-control qa-deploy-token-username'
+    .text-secondary= s_('DeployTokens|Default format is "gitlab+deploy-token-{n}". Enter custom username if you want to change it.')
+
+  .form-group
     = f.label :scopes, class: 'label-bold'
     %fieldset.form-group.form-check
       = f.check_box :read_repository, class: 'form-check-input qa-deploy-token-read-repository'
diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index db1f15f96b8..e34973f1f43 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -1,49 +1,9 @@
-- page_title "Container Registry"
-
 %section
-  .settings-header
-    %h4
-      = page_title
-    %p
-      = s_('ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images.')
-    %p.append-bottom-0
-      = succeed '.' do
-        = s_('ContainerRegistry|Learn more about')
-        = link_to _('Container Registry'), help_page_path('user/project/container_registry'), target: '_blank'
   .row.registry-placeholder.prepend-bottom-10
-    .col-lg-12
-      #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } }
-
-  .row.prepend-top-10
-    .col-lg-12
-      .card
-        .card-header
-          = s_('ContainerRegistry|How to use the Container Registry')
-        .card-body
-          %p
-            - link_token = link_to(_('personal access token'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'personal-access-tokens'), target: '_blank')
-            - link_2fa = link_to(_('2FA enabled'), help_page_path('user/profile/account/two_factor_authentication'), target: '_blank')
-            = s_('ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:').html_safe % { link_2fa: link_2fa, link_token: link_token }
-          %pre
-            docker login #{Gitlab.config.registry.host_port}
-          %br
-          %p
-            - deploy_token = link_to(_('deploy token'), help_page_path('user/project/deploy_tokens/index', anchor: 'read-container-registry-images'), target: '_blank')
-            = s_('ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images.').html_safe % { deploy_token: deploy_token }
-          %br
-          %p
-            = s_('ContainerRegistry|Once you log in, you&rsquo;re free to create and upload a container image using the common %{build} and %{push} commands').html_safe % { build: "<code>build</code>".html_safe, push: "<code>push</code>".html_safe }
-          %pre
-            :plain
-              docker build -t #{escape_once(@project.container_registry_url)} .
-              docker push #{escape_once(@project.container_registry_url)}
-          %hr
-          %h5.prepend-top-default
-            = s_('ContainerRegistry|Use different image names')
-          %p.light
-            = s_('ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:')
-          %pre
-            :plain
-              #{escape_once(@project.container_registry_url)}:tag
-              #{escape_once(@project.container_registry_url)}/optional-image-name:tag
-              #{escape_once(@project.container_registry_url)}/optional-name/optional-image-name:tag
+    .col-12
+      #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json),
+        "help_page_path" => help_page_path('user/project/container_registry'),
+        "no_containers_image" => image_path('illustrations/docker-empty-state.svg'),
+        "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
+        "repository_url" => escape_once(@project.container_registry_url),
+        character_error: @character_error.to_s } }