Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/pages/projects/blob/show/index.js

@@ -3,6 +3,7 @@ import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_sta
 import BlobViewer from '~/blob/viewer/index';
 import initBlob from '~/pages/projects/init_blob';
 import GpgBadges from '~/gpg_badges';
+import '~/sourcegraph/load';
 document.addEventListener('DOMContentLoaded', () => {
   new BlobViewer(); // eslint-disable-line no-new

app/assets/javascripts/pages/projects/commit/show/index.js

@@ -9,6 +9,7 @@ import initNotes from '~/init_notes';
 import initChangesDropdown from '~/init_changes_dropdown';
 import initDiffNotes from '~/diff_notes/diff_notes_bundle';
 import { fetchCommitMergeRequests } from '~/commit_merge_requests';
+import '~/sourcegraph/load';
 document.addEventListener('DOMContentLoaded', () => {
   const hasPerfBar = document.querySelector('.with-performance-bar');

app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js

@@ -5,6 +5,7 @@ import { handleLocationHash } from '~/lib/utils/common_utils';
 import howToMerge from '~/how_to_merge';
 import initPipelines from '~/commit/pipelines/pipelines_bundle';
 import initVueIssuableSidebarApp from '~/issuable_sidebar/sidebar_bundle';
+import initSourcegraph from '~/sourcegraph';
 import initWidget from '../../../vue_merge_request_widget';
 export default function() {
@@ -19,4 +20,5 @@ export default function() {
   handleLocationHash();
   howToMerge();
   initWidget();
+  initSourcegraph();
 }

app/assets/javascripts/pages/projects/pages_domains/form.js

 import setupToggleButtons from '~/toggle_buttons';
+function updateVisibility(selector, isVisible) {
+  Array.from(document.querySelectorAll(selector)).forEach(el => {
+    if (isVisible) {
+      el.classList.remove('d-none');
+    } else {
+      el.classList.add('d-none');
+    }
+  });
+}
+
 export default () => {
   const toggleContainer = document.querySelector('.js-auto-ssl-toggle-container');
   if (toggleContainer) {
     const onToggleButtonClicked = isAutoSslEnabled => {
-      Array.from(document.querySelectorAll('.js-shown-unless-auto-ssl')).forEach(el => {
-        if (isAutoSslEnabled) {
-          el.classList.add('d-none');
-        } else {
-          el.classList.remove('d-none');
-        }
-      });
+      updateVisibility('.js-shown-unless-auto-ssl', !isAutoSslEnabled);
+
+      updateVisibility('.js-shown-if-auto-ssl', isAutoSslEnabled);
       Array.from(document.querySelectorAll('.js-enabled-unless-auto-ssl')).forEach(el => {
         if (isAutoSslEnabled) {

app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue

@@ -64,14 +64,14 @@ export default {
         v-for="(testSuite, index) in getTestSuites"
         :key="index"
         role="row"
-        class="gl-responsive-table-row test-reports-summary-row rounded cursor-pointer js-suite-row"
+        class="gl-responsive-table-row gl-responsive-table-row-clickable test-reports-summary-row rounded cursor-pointer js-suite-row"
         @click="tableRowClick(testSuite)"
       >
         <div class="table-section section-25">
           <div role="rowheader" class="table-mobile-header font-weight-bold">
             {{ __('Suite') }}
           </div>
-          <div class="table-mobile-content test-reports-summary-suite cgray pl-3">
+          <div class="table-mobile-content underline cgray pl-3">
             {{ testSuite.name }}
           </div>
         </div>

app/assets/javascripts/releases/detail/index.js

@@ -5,7 +5,7 @@ import createStore from './store';
 export default () => {
   const el = document.getElementById('js-edit-release-page');
-  const store = createStore(el.dataset);
+  const store = createStore();
   store.dispatch('setInitialState', el.dataset);
   return new Vue({

app/assets/javascripts/repository/components/last_commit.vue

@@ -109,7 +109,7 @@ export default {
             class="text-expander"
             @click="toggleShowDescription"
           >
-            <icon name="ellipsis_h" />
+            <icon name="ellipsis_h" :size="10" />
           </gl-button>
           <div class="committer">
             <gl-link
@@ -124,7 +124,7 @@ export default {
           </div>
           <pre
             v-if="commit.description"
-            v-show="showDescription"
+            :class="{ 'd-block': showDescription }"
             class="commit-row-description append-bottom-8"
           >
             {{ commit.description }}

app/assets/javascripts/repository/log_tree.js

 import axios from '~/lib/utils/axios_utils';
+import { normalizeData } from 'ee_else_ce/repository/utils/commit';
 import getCommits from './queries/getCommits.query.graphql';
 import getProjectPath from './queries/getProjectPath.query.graphql';
 import getRef from './queries/getRef.query.graphql';
@@ -6,19 +7,6 @@ import getRef from './queries/getRef.query.graphql';
 let fetchpromise;
 let resolvers = [];
-export function normalizeData(data) {
-  return data.map(d => ({
-    sha: d.commit.id,
-    message: d.commit.message,
-    committedDate: d.commit.committed_date,
-    commitPath: d.commit_path,
-    fileName: d.file_name,
-    type: d.type,
-    lockLabel: d.lock_label,
-    __typename: 'LogTreeCommit',
-  }));
-}
-
 export function resolveCommit(commits, { resolve, entry }) {
   const commit = commits.find(c => c.fileName === entry.name && c.type === entry.type);

app/assets/javascripts/repository/queries/commit.fragment.graphql

+fragment TreeEntryCommit on LogTreeCommit {
+  sha
+  message
+  committedDate
+  commitPath
+  fileName
+  type
+}

app/assets/javascripts/repository/queries/getCommit.query.graphql

+#import "ee_else_ce/repository/queries/commit.fragment.graphql"
+
 query getCommit($fileName: String!, $type: String!, $path: String!) {
   commit(path: $path, fileName: $fileName, type: $type) @client {
-    sha
-    message
-    committedDate
-    commitPath
-    fileName
-    type
-    lockLabel
+    ...TreeEntryCommit
   }
 }

app/assets/javascripts/repository/queries/getCommits.query.graphql

+#import "ee_else_ce/repository/queries/commit.fragment.graphql"
+
 query getCommits {
   commits @client {
-    sha
-    message
-    committedDate
-    commitPath
-    fileName
-    type
-    lockLabel
+    ...TreeEntryCommit
   }
 }

app/assets/javascripts/repository/queries/pathLastCommit.query.graphql

@@ -5,7 +5,7 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
         lastCommit {
           sha
           title
-          message
+          description
           webUrl
           authoredDate
           author {

app/assets/javascripts/repository/utils/commit.js

+// eslint-disable-next-line import/prefer-default-export
+export function normalizeData(data, extra = () => {}) {
+  return data.map(d => ({
+    sha: d.commit.id,
+    message: d.commit.message,
+    committedDate: d.commit.committed_date,
+    commitPath: d.commit_path,
+    fileName: d.file_name,
+    type: d.type,
+    __typename: 'LogTreeCommit',
+    ...extra(d),
+  }));
+}

app/assets/javascripts/sourcegraph/index.js

+function loadScript(path) {
+  const script = document.createElement('script');
+  script.type = 'application/javascript';
+  script.src = path;
+  script.defer = true;
+  document.head.appendChild(script);
+}
+
+/**
+ * Loads the Sourcegraph integration for support for Sourcegraph extensions and
+ * code intelligence.
+ */
+export default function initSourcegraph() {
+  const { url } = gon.sourcegraph || {};
+
+  if (!url) {
+    return;
+  }
+
+  const assetsUrl = new URL('/assets/webpack/sourcegraph/', window.location.href);
+  const scriptPath = new URL('scripts/integration.bundle.js', assetsUrl).href;
+
+  window.SOURCEGRAPH_ASSETS_URL = assetsUrl.href;
+  window.SOURCEGRAPH_URL = url;
+  window.SOURCEGRAPH_INTEGRATION = 'gitlab-integration';
+
+  loadScript(scriptPath);
+}

app/assets/javascripts/sourcegraph/load.js

+import initSourcegraph from './index';
+
+/**
+ * Load sourcegraph in it's own listener so that it's isolated from failures.
+ */
+document.addEventListener('DOMContentLoaded', initSourcegraph);

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -168,7 +168,7 @@ export default {
             :prepend="true"
             tag="* [ ] "
             :button-title="__('Add a task list')"
-            icon="task-done"
+            icon="list-task"
           />
           <toolbar-button
             :tag="mdTable"

app/assets/stylesheets/framework/common.scss

@@ -572,3 +572,10 @@ img.emoji {
 .gl-font-size-20 { font-size: $gl-font-size-20; }
 .gl-font-size-28 { font-size: $gl-font-size-28; }
 .gl-font-size-42 { font-size: $gl-font-size-42; }
+
+.border-section {
+  @include gl-py-6;
+  @include gl-m-0;
+
+  border-top: 1px solid $border-color;
+}

app/assets/stylesheets/framework/responsive_tables.scss

@@ -20,6 +20,17 @@
   @extend .gl-responsive-table-row-layout;
   margin-top: 10px;
   border: 1px solid $border-color;
+  color: $gray-700;
+
+  &.gl-responsive-table-row-clickable {
+    &:hover {
+      background-color: $gray-light;
+
+      .underline {
+        text-decoration: underline;
+      }
+    }
+  }
   @include media-breakpoint-up(md) {
     margin: 0;

app/assets/stylesheets/pages/pipelines.scss

@@ -1084,18 +1084,6 @@ button.mini-pipeline-graph-dropdown-toggle {
 }
 .test-reports-table {
-  color: $gray-700;
-
-  .test-reports-summary-row {
-    &:hover {
-      background-color: $gray-light;
-
-      .test-reports-summary-suite {
-        text-decoration: underline;
-      }
-    }
-  }
-
   .build-trace {
     @include build-trace();
   }

app/controllers/concerns/sourcegraph_gon.rb

+# frozen_string_literal: true
+
+module SourcegraphGon
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :push_sourcegraph_gon, if: :html_request?
+  end
+
+  private
+
+  def push_sourcegraph_gon
+    return unless sourcegraph_enabled?
+
+    gon.push({
+      sourcegraph: { url: Gitlab::CurrentSettings.sourcegraph_url }
+    })
+  end
+
+  def sourcegraph_enabled?
+    Gitlab::CurrentSettings.sourcegraph_enabled && sourcegraph_enabled_for_project? && current_user&.sourcegraph_enabled
+  end
+
+  def sourcegraph_enabled_for_project?
+    return false unless project && Gitlab::Sourcegraph.feature_enabled?(project)
+    return project.public? if Gitlab::CurrentSettings.sourcegraph_public_only
+
+    true
+  end
+end