Add latest changes from gitlab-org/gitlab@master

4 files changed, 32 insertions, 19 deletions

diff --git a/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue
index 6e9a705c046..5fd9f7cfd4f 100644
--- a/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue
+++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue
@@ -2,7 +2,12 @@
 import { GlLoadingIcon } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapActions, mapGetters, mapState } from 'vuex';
-import { getParameterValues } from '~/lib/utils/url_utility';
+import {
+  getParameterValues,
+  updateHistory,
+  setUrlParams,
+  removeParams,
+} from '~/lib/utils/url_utility';
 import EmptyState from './empty_state.vue';
 import TestSuiteTable from './test_suite_table.vue';
 import TestSummary from './test_summary.vue';
@@ -49,12 +54,28 @@ export default {
     ]),
     summaryBackClick() {
       this.removeSelectedSuiteIndex();
+
+      updateHistory({
+        url: removeParams(['job_name']),
+        title: document.title,
+        replace: true,
+      });
     },
     summaryTableRowClick(index) {
       this.setSelectedSuiteIndex(index);
 
       // Fetch the test suite when the user clicks to see more details
       this.fetchTestSuite(index);
+
+      const urlParams = {
+        job_name: this.getSelectedSuite.name,
+      };
+
+      updateHistory({
+        url: setUrlParams(urlParams),
+        title: document.title,
+        replace: true,
+      });
     },
     beforeEnterTransition() {
       document.documentElement.style.overflowX = 'hidden';
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 9aaae960b6f..77ce5ea5910 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -352,7 +352,7 @@ export default {
         </template>
       </gl-sprintf>
     </div>
-    <div class="flash-container timeline-content"></div>
+    <div class="flash-container"></div>
     <form :data-line-code="lineCode" class="edit-note common-note-form js-quick-submit gfm-form">
       <comment-field-layout :noteable-data="getNoteableData" :is-internal-note="isInternalNote">
         <markdown-editor
diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss
index 6b4f1478978..56667c10752 100644
--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -96,14 +96,6 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
   }
 }
 
-@include media-breakpoint-down(sm) {
-  ul.notes {
-    .flash-container.timeline-content {
-      margin-left: 0;
-    }
-  }
-}
-
 .gl-browser-ie .flash-container {
   position: fixed;
   max-width: $limited-layout-width;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8792c7f9a72..483d151adab 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -88,18 +88,18 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
         margin-top: 5px;
       }
 
-      .timeline-content:not(.flash-container) {
+      .timeline-content {
         margin-left: 2.5rem;
         border: 1px solid $border-color;
         border-radius: $gl-border-radius-base;
         padding: $gl-padding-4 $gl-padding-8;
       }
 
-      &:not(.target) .timeline-content:not(.flash-container) {
+      &:not(.target) .timeline-content {
         background-color: $white;
       }
 
-      &.draft-note .timeline-content:not(.flash-container) {
+      &.draft-note .timeline-content {
         border: 0;
       }
 
@@ -127,7 +127,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
               margin-top: 5px;
             }
 
-            .timeline-content:not(.flash-container) {
+            .timeline-content {
               margin-left: 2.5rem;
               border-left: 1px solid $border-color;
               border-right: 1px solid $border-color;
@@ -138,11 +138,11 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
             }
           }
 
-          &:not(.target) .timeline-content:not(.flash-container) {
+          &:not(.target) .timeline-content {
             background-color: $white;
           }
 
-          &.draft-note .timeline-content:not(.flash-container) {
+          &.draft-note .timeline-content {
             margin-left: 0;
             border-top-left-radius: 0;
             border-top-right-radius: 0;
@@ -154,7 +154,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
             border-right: 1px solid $border-color;
             background-color: $white;
 
-            .timeline-content:not(.flash-container) {
+            .timeline-content {
               padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 18px;
             }
 
@@ -1057,7 +1057,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
       padding-left: 0;
 
       ul.notes li.note-wrapper {
-        .timeline-content:not(.flash-container) {
+        .timeline-content {
           padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding;
         }
 
@@ -1106,7 +1106,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
   }
 
   .draft-note-component.draft-note.timeline-entry {
-    .timeline-content:not(.flash-container) {
+    .timeline-content {
       padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding;
     }