Merge branch '43270-import-with-milestones-failing' of...

Merge branch '43270-import-with-milestones-failing' of gitlab.com:gitlab-org/gitlab-ce into 43270-import-with-milestones-failing

app/assets/stylesheets/bootstrap_migration.scss

@@ -208,6 +208,15 @@ table {
     &:not(:last-of-type) {
       border-bottom: 1px solid $well-inner-border;
     }
+
+    p,
+    ol,
+    ul,
+    .form-group {
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .badge.badge-gray {

app/assets/stylesheets/pages/settings.scss

@@ -296,7 +296,8 @@
   }
 
   .btn-clipboard {
-    margin-left: 5px;
+    background-color: $white-light;
+    border: 1px solid $theme-gray-200;
   }
 
   .deploy-token-help-block {

app/views/projects/deploy_tokens/_index.html.haml

@@ -10,7 +10,6 @@
   .settings-content
     - if @new_deploy_token.persisted?
       = render 'projects/deploy_tokens/new_deploy_token', deploy_token: @new_deploy_token
-    - else
     %h5.prepend-top-0
       = s_('DeployTokens|Add a deploy token')
     = render 'projects/deploy_tokens/form', project: @project, token: @new_deploy_token, presenter: @deploy_tokens

app/views/projects/deploy_tokens/_new_deploy_token.html.haml

-.created-deploy-token-container
+.created-deploy-token-container.info-well
+  .well-segment
     %h5.prepend-top-0
       = s_('DeployTokens|Your New Deploy Token')
 
     .form-group
+      .input-group
         = text_field_tag 'deploy-token-user', deploy_token.username, readonly: true, class: 'deploy-token-field form-control js-select-on-focus'
+        .input-group-append
           = clipboard_button(text: deploy_token.username, title: s_('DeployTokens|Copy username to clipboard'), placement: 'left')
       %span.deploy-token-help-block.prepend-top-5.text-success= s_("DeployTokens|Use this username as a login.")
 
     .form-group
+      .input-group
         = text_field_tag 'deploy-token', deploy_token.token, readonly: true, class: 'deploy-token-field form-control js-select-on-focus'
+        .input-group-append
           = clipboard_button(text: deploy_token.token, title: s_('DeployTokens|Copy deploy token to clipboard'), placement: 'left')
       %span.deploy-token-help-block.prepend-top-5.text-danger= s_("DeployTokens|Use this token as a password. Make sure you save it - you won't be able to access it again.")
-%hr

changelogs/unreleased/46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creation-page.yml

+---
+title: Allows you to create another deploy token dimmediately after creating one
+merge_request: 19639
+author:
+type: changed