Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/assets/javascripts/registry/components/table_registry.vue → app/assets/javascripts/registry/list/components/table_registry.vue

@@ -23,7 +23,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [timeagoMixin],
+  mixins: [timeagoMixin, Tracking.mixin()],
   props: {
     repo: {
       type: Object,
@@ -71,9 +71,6 @@ export default {
   },
   methods: {
     ...mapActions(['fetchList', 'deleteItem', 'multiDeleteItems']),
-    track(action) {
-      Tracking.event(document.body.dataset.page, action, this.tracking);
-    },
     setModalDescription(itemIndex = -1) {
       if (itemIndex === -1) {
         this.modalDescription = sprintf(

app/assets/javascripts/registry/constants.js → app/assets/javascripts/registry/list/constants.js

-import { __ } from '../locale';
+import { __ } from '~/locale';
 export const FETCH_REGISTRY_ERROR_MESSAGE = __(
   'Something went wrong while fetching the registry list.',

app/assets/javascripts/registry/index.js → app/assets/javascripts/registry/list/index.js

 import Vue from 'vue';
 import registryApp from './components/app.vue';
-import Translate from '../vue_shared/translate';
+import Translate from '~/vue_shared/translate';
 Vue.use(Translate);

app/assets/javascripts/user_popovers.js

@@ -17,6 +17,7 @@ const handleUserPopoverMouseOut = event => {
     renderedPopover.$destroy();
     renderedPopover = null;
   }
+  target.removeAttribute('aria-describedby');
 };
 /**

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue

@@ -155,7 +155,7 @@ export default {
           {{ cherryPickLabel }}
         </a>
       </div>
-      <section class="mr-info-list">
+      <section class="mr-info-list" data-qa-selector="merged_status_content">
         <p>
           {{ s__('mrWidget|The changes were merged into') }}
           <span class="label-branch">

app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue

@@ -249,9 +249,10 @@ export default {
               type="button"
               class="btn btn-sm btn-info dropdown-toggle js-merge-moment"
               data-toggle="dropdown"
+              data-qa-selector="merge_moment_dropdown"
               :aria-label="__('Select merge moment')"
             >
-              <i class="fa fa-chevron-down qa-merge-moment-dropdown" aria-hidden="true"></i>
+              <i class="fa fa-chevron-down" aria-hidden="true"></i>
             </button>
             <ul
               v-if="shouldShowMergeImmediatelyDropdown"
@@ -272,7 +273,8 @@ export default {
               </li>
               <li>
                 <a
-                  class="accept-merge-request qa-merge-immediately-option"
+                  class="accept-merge-request"
+                  data-qa-selector="merge_immediately_option"
                   href="#"
                   @click.prevent="handleMergeButtonClick(false, true)"
                 >

app/assets/javascripts/vue_shared/components/bar_chart.vue

@@ -55,13 +55,13 @@ export default {
       vbWidth: 0,
       vbHeight: 0,
       vpWidth: 0,
-      vpHeight: 350,
-      preserveAspectRatioType: 'xMidYMid meet',
+      vpHeight: 200,
+      preserveAspectRatioType: 'xMidYMin meet',
       containerMargin: {
         leftRight: 30,
       },
       viewBoxMargin: {
-        topBottom: 150,
+        topBottom: 100,
       },
       panX: 0,
       xScale: {},
@@ -274,6 +274,7 @@ export default {
   <div ref="svgContainer" :class="activateGrabCursor" class="svg-graph-container">
     <svg
       ref="baseSvg"
+      class="svg-graph overflow-visible pt-5"
       :width="vpWidth"
       :height="vpHeight"
       :viewBox="svgViewBox"

app/assets/stylesheets/framework/common.scss

@@ -442,6 +442,7 @@ img.emoji {
 .ws-normal { white-space: normal; }
 .ws-pre-wrap { white-space: pre-wrap; }
 .overflow-auto { overflow: auto; }
+.overflow-visible { overflow: visible; }
 .d-flex-center {
   display: flex;

app/assets/stylesheets/framework/lists.scss

@@ -196,6 +196,11 @@ ul.content-list {
     display: flex;
     align-items: center;
     white-space: nowrap;
+
+    // Override style that allows the flex-row text to wrap.
+    &.allow-wrap {
+      white-space: normal;
+    }
   }
   .row-main-content {

app/assets/stylesheets/page_bundles/ide.scss

@@ -883,6 +883,15 @@ $ide-commit-header-height: 48px;
   margin-right: $ide-tree-padding;
   border-bottom: 1px solid $white-dark;
+  svg {
+    color: $gray-700;
+
+    &:focus,
+    &:hover {
+      color: $blue-600;
+    }
+  }
+
   .ide-new-btn {
     margin-left: auto;
   }
@@ -899,6 +908,11 @@ $ide-commit-header-height: 48px;
     .dropdown-menu-toggle {
       svg {
         vertical-align: middle;
+        color: $gray-700;
+
+        &:hover {
+          color: $gray-700;
+        }
       }
       &:hover {

app/assets/stylesheets/pages/error_details.scss

@@ -12,6 +12,12 @@
     }
   }
+  .file-title-name {
+    &.limited-width {
+      max-width: 80%;
+    }
+  }
+
   .line_content.old::before {
     content: none !important;
   }

app/assets/stylesheets/pages/issues.scss

@@ -21,16 +21,11 @@
       margin-bottom: 2px;
     }
-    .issue-labels {
+    .issue-labels,
+    .author-link {
       display: inline-block;
     }
-    .issuable-meta {
-      .author-link {
-        display: inline-block;
-      }
-    }
-
     .icon-merge-request-unmerged {
       height: 13px;
       margin-bottom: 3px;
@@ -53,16 +48,6 @@
   margin-right: 15px;
 }
-.issues_content {
-  .title {
-    height: 40px;
-  }
-
-  form {
-    margin: 0;
-  }
-}
-
 form.edit-issue {
   margin: 0;
 }
@@ -79,10 +64,6 @@ ul.related-merge-requests > li {
     margin-left: 5px;
   }
-  .row_title {
-    vertical-align: bottom;
-  }
-
   gl-emoji {
     font-size: 1em;
   }
@@ -93,10 +74,6 @@ ul.related-merge-requests > li {
   font-weight: $gl-font-weight-bold;
 }
-.merge-request-id {
-  display: inline-block;
-}
-
 .merge-request-status {
   &.merged {
     color: $blue-500;
@@ -118,11 +95,7 @@ ul.related-merge-requests > li {
     border-color: $issues-today-border;
   }
-  &.closed {
-    background: $gray-light;
-    border-color: $border-color;
-  }
-
+  &.closed,
   &.merged {
     background: $gray-light;
     border-color: $border-color;
@@ -160,9 +133,12 @@ ul.related-merge-requests > li {
   padding-bottom: 37px;
 }
-.issues-nav-controls {
+.issues-nav-controls,
+.new-branch-col {
   font-size: 0;
+}
+.issues-nav-controls {
   .btn-group:empty {
     display: none;
   }
@@ -198,8 +174,6 @@ ul.related-merge-requests > li {
 }
 .new-branch-col {
-  font-size: 0;
-
   .discussion-filter-container {
     &:not(:only-child) {
       margin-right: $gl-padding-8;
@@ -297,11 +271,11 @@ ul.related-merge-requests > li {
       padding-top: 0;
       align-self: center;
     }
-    .create-mr-dropdown-wrap {
-      .btn-group:not(.hidden) {
-        display: inline-flex;
-      }
+  }
+  .create-mr-dropdown-wrap {
+    .btn-group:not(.hidden) {
+      display: inline-flex;
     }
   }
 }

app/assets/stylesheets/pages/tree.scss

@@ -15,7 +15,6 @@
       }
       .tree-controls {
-        display: flex;
         text-align: right;
         .btn {