Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 6 deletions

diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue
index b76679960ca..61239a564a8 100644
--- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue
@@ -159,7 +159,8 @@ export default {
       v-gl-tooltip
       :disabled="removeDisabled"
       type="button"
-      class="btn btn-default btn-svg btn-item-remove js-issue-item-remove-button qa-remove-issue-button mr-xl-0 align-self-xl-center"
+      class="btn btn-default btn-svg btn-item-remove js-issue-item-remove-button mr-xl-0 align-self-xl-center"
+      data-qa-selector="remove_related_issue_button"
       :title="__('Remove')"
       :aria-label="__('Remove')"
       @click="onRemoveRequest"
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 05ae9b1d1ed..0e29b0b7dda 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -177,7 +177,7 @@
       transition: padding $sidebar-transition-duration;
       display: flex;
       align-items: center;
-      padding: 12px 15px;
+      padding: 12px $gl-padding;
       color: $gl-text-color-secondary;
     }
 
@@ -341,7 +341,7 @@
       > a {
         margin-left: 4px;
         // Subtract width of left border on active element
-        padding-left: 11px;
+        padding-left: $gl-padding-12;
       }
 
       .badge.badge-pill {
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 0d2a96d1917..5122c2517aa 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -17,8 +17,6 @@
       .dropdown-menu.frequent-items-dropdown-menu
         = render "layouts/nav/groups_dropdown/show"
 
-  = render_if_exists 'layouts/nav/sidebar/analytics_link'
-
   - if any_dashboard_nav_link?([:groups, :milestones, :activity, :snippets])
     %li.header-more.dropdown
       %a{ href: "#", data: { toggle: "dropdown", qa_selector: 'more_dropdown' } }
@@ -45,7 +43,7 @@
               = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', data: { qa_selector: 'snippets_link' } do
                 = _('Snippets')
 
-          = render_if_exists 'layouts/nav/sidebar/analytics_more_link'
+          = render_if_exists 'layouts/nav/sidebar/analytics_link'
 
           %li.dropdown
             = render_if_exists 'dashboard/nav_link_list'