Merge branch 'master' into 48746-fix-files-uploaded-in-base64

.rubocop.yml

@@ -50,7 +50,8 @@ Style/FrozenStringLiteralComment:
     - 'danger/**/*'
     - 'db/**/*'
     - 'ee/**/*'
-    - 'lib/**/*'
+    - 'lib/gitlab/**/*'
+    - 'lib/tasks/**/*'
     - 'qa/**/*'
     - 'rubocop/**/*'
     - 'scripts/**/*'
@@ -84,6 +85,7 @@ Naming/FileName:
     - EE
     - JSON
     - LDAP
+    - SAML
     - IO
     - HMAC
     - QA

GITLAB_PAGES_VERSION

-1.1.0
+1.2.1

GITLAB_SHELL_VERSION

-8.3.3
+8.4.0
\ No newline at end of file

app/assets/javascripts/clusters/components/applications.vue

 <script>
 import _ from 'underscore';
-import helmInstallIllustration from '@gitlab-org/gitlab-svgs/illustrations/kubernetes-installation.svg';
+import helmInstallIllustration from '@gitlab-org/gitlab-svgs/dist/illustrations/kubernetes-installation.svg';
 import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png';
 import gitlabLogo from 'images/cluster_app_logos/gitlab.png';
 import helmLogo from 'images/cluster_app_logos/helm.png';

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -20,6 +20,11 @@ export default {
     Tooltip,
   },
   props: {
+    discussionPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
     diffFile: {
       type: Object,
       required: true,
@@ -65,8 +70,7 @@ export default {
       if (this.diffFile.submodule) {
         return this.diffFile.submoduleTreeUrl || this.diffFile.submoduleLink;
       }
-
-      return `#${this.diffFile.fileHash}`;
+      return this.discussionPath;
     },
     filePath() {
       if (this.diffFile.submodule) {
@@ -152,7 +156,7 @@ export default {
         v-once
         ref="titleWrapper"
         :href="titleLink"
-        class="append-right-4"
+        class="append-right-4 js-title-wrapper"
       >
         <file-icon
           :file-name="filePath"

app/assets/javascripts/diffs/store/modules/diff_state.js

 import Cookies from 'js-cookie';
 import { getParameterValues } from '~/lib/utils/url_utility';
+import bp from '~/breakpoints';
 import { INLINE_DIFF_VIEW_TYPE, DIFF_VIEW_COOKIE_NAME, MR_TREE_SHOW_KEY } from '../../constants';
 const viewTypeFromQueryString = getParameterValues('view')[0];
@@ -20,6 +21,7 @@ export default () => ({
   diffViewType: viewTypeFromQueryString || viewTypeFromCookie || defaultViewType,
   tree: [],
   treeEntries: {},
-  showTreeList: storedTreeShow === null ? true : storedTreeShow === 'true',
+  showTreeList:
+    storedTreeShow === null ? bp.getBreakpointSize() !== 'xs' : storedTreeShow === 'true',
   currentDiffFileId: '',
 });

app/assets/javascripts/jobs/components/job_app.vue

@@ -18,7 +18,7 @@
       StuckBlock,
     },
     props: {
-      runnerHelpUrl: {
+      runnerSettingsUrl: {
         type: String,
         required: false,
         default: null,
@@ -30,7 +30,7 @@
         'headerActions',
         'headerTime',
         'shouldRenderCalloutMessage',
-        'jobHasStarted',
+        'shouldRenderTriggeredLabel',
         'hasEnvironment',
         'isJobStuck',
         'hasTrace',
@@ -58,7 +58,7 @@
             :user="job.user"
             :actions="headerActions"
             :has-sidebar-button="true"
-            :should-render-triggered-label="jobHasStarted"
+            :should-render-triggered-label="shouldRenderTriggeredLabel"
             :item-name="__('Job')"
           />
         </div>
@@ -76,7 +76,7 @@
         class="js-job-stuck"
         :has-no-runners-for-project="job.runners.available"
         :tags="job.tags"
-        :runners-path="runnerHelpUrl"
+        :runners-path="runnerSettingsUrl"
       />
       <environments-block
@@ -87,8 +87,8 @@
       />
       <erased-block
-        v-if="job.erased"
-        class="js-job-erased"
+        v-if="job.erased_at"
+        class="js-job-erased-block"
         :user="job.erased_by"
         :erased-at="job.erased_at"
       />

app/assets/javascripts/jobs/components/job_log_controllers.vue

@@ -65,7 +65,7 @@ export default {
 };
 </script>
 <template>
-  <div class="top-bar">
+  <div class="top-bar affix js-top-bar">
     <!-- truncate information -->
     <div class="js-truncated-info truncated-info d-none d-sm-block float-left">
       <template v-if="isTraceSizeVisible">

app/assets/javascripts/jobs/components/sidebar.vue

@@ -36,7 +36,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(['job', 'isLoading', 'stages', 'jobs']),
+    ...mapState(['job', 'isLoading', 'stages', 'jobs', 'selectedStage']),
     coverage() {
       return `${this.job.coverage}%`;
     },
@@ -110,7 +110,7 @@ export default {
 </script>
 <template>
   <aside
-    class="right-sidebar right-sidebar-expanded build-sidebar"
+    class="js-build-sidebar right-sidebar right-sidebar-expanded build-sidebar"
     data-offset-top="101"
     data-spy="affix"
   >
@@ -276,6 +276,7 @@ export default {
           <stages-dropdown
             :stages="stages"
             :pipeline="job.pipeline"
+            :selected-stage="selectedStage"
             @requestSidebarStageDropdown="fetchJobsForStage"
           />

app/assets/javascripts/jobs/components/stages_dropdown.vue

@@ -2,7 +2,6 @@
 import _ from 'underscore';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import Icon from '~/vue_shared/components/icon.vue';
-import { __ } from '~/locale';
 export default {
   components: {
@@ -18,30 +17,20 @@ export default {
       type: Array,
       required: true,
     },
+    selectedStage: {
+      type: String,
+      required: true,
+    },
   },
-  data() {
-    return {
-      selectedStage: this.stages.length > 0 ? this.stages[0].name : __('More'),
-    };
-  },
+
   computed: {
     hasRef() {
       return !_.isEmpty(this.pipeline.ref);
     },
   },
-  watch: {
-    // When the component is initially mounted it may start with an empty stages array.
-    // Once the prop is updated, we set the first stage as the selected one
-    stages(newVal) {
-      if (newVal.length) {
-        this.selectedStage = newVal[0].name;
-      }
-    },
-  },
   methods: {
     onStageClick(stage) {
       this.$emit('requestSidebarStageDropdown', stage);
-      this.selectedStage = stage.name;
     },
   },
 };

app/assets/javascripts/jobs/job_details_bundle.js

@@ -9,8 +9,7 @@ import createStore from './store';
 export default () => {
   const { dataset } = document.getElementById('js-job-details-vue');
-  // eslint-disable-next-line no-new
-  new Job();
+
   const store = createStore();
   store.dispatch('setJobEndpoint', dataset.endpoint);
@@ -33,7 +32,7 @@ export default () => {
         props: {
           isLoading: this.isLoading,
           job: this.job,
-          runnerHelpUrl: dataset.runnerHelpUrl,
+          runnerSettingsUrl: dataset.runnerSettingsUrl,
         },
       });
     },
@@ -71,4 +70,7 @@ export default () => {
       });
     },
   });
+
+  // eslint-disable-next-line no-new
+  new Job();
 };

app/assets/javascripts/jobs/store/actions.js

@@ -139,10 +139,12 @@ export const fetchStages = ({ state, dispatch }) => {
   dispatch('requestStages');
   axios
-    .get(state.job.pipeline.path)
+    .get(`${state.job.pipeline.path}.json`)
     .then(({ data }) => {
+      // Set selected stage
       dispatch('receiveStagesSuccess', data.details.stages);
-      dispatch('fetchJobsForStage', data.details.stages[0]);
+      const selectedStage = data.details.stages.find(stage => stage.name === state.selectedStage);
+      dispatch('fetchJobsForStage', selectedStage);
     })
     .catch(() => dispatch('receiveStagesError'));
 };
@@ -156,11 +158,12 @@ export const receiveStagesError = ({ commit }) => {
 /**
  * Jobs list on sidebar - depend on stages dropdown
  */
-export const requestJobsForStage = ({ commit }) => commit(types.REQUEST_JOBS_FOR_STAGE);
+export const requestJobsForStage = ({ commit }, stage) =>
+  commit(types.REQUEST_JOBS_FOR_STAGE, stage);
 // On stage click, set selected stage + fetch job
 export const fetchJobsForStage = ({ dispatch }, stage) => {
-  dispatch('requestJobsForStage');
+  dispatch('requestJobsForStage', stage);
   axios
     .get(stage.dropdown_path, {

app/assets/javascripts/jobs/store/getters.js

@@ -22,10 +22,10 @@ export const shouldRenderCalloutMessage = state =>
   !_.isEmpty(state.job.status) && !_.isEmpty(state.job.callout_message);
 /**
- * When job has not started the key will be `false`
+ * When job has not started the key will be null
  * When job started the key will be a string with a date.
  */
-export const jobHasStarted = state => !(state.job.started === false);
+export const shouldRenderTriggeredLabel = state => _.isString(state.job.started);
 export const hasEnvironment = state => !_.isEmpty(state.job.deployment_status);

app/assets/javascripts/jobs/store/mutations.js

@@ -53,6 +53,16 @@ export default {
     state.isLoading = false;
     state.hasError = false;
     state.job = job;
+
+    /**
+     * We only update it on the first request
+     * The dropdown can be changed by the user
+     * after the first request,
+     * and we do not want to hijack that
+     */
+    if (state.selectedStage === 'More' && job.stage) {
+      state.selectedStage = job.stage;
+    }
   },
   [types.RECEIVE_JOB_ERROR](state) {
     state.isLoading = false;
@@ -81,8 +91,9 @@ export default {
     state.stages = [];
   },
-  [types.REQUEST_JOBS_FOR_STAGE](state) {
+  [types.REQUEST_JOBS_FOR_STAGE](state, stage) {
     state.isLoadingJobs = true;
+    state.selectedStage = stage.name;
   },
   [types.RECEIVE_JOBS_FOR_STAGE_SUCCESS](state, jobs) {
     state.isLoadingJobs = false;

app/assets/javascripts/jobs/store/state.js

+import { __ } from '~/locale';
+
 export default () => ({
   jobEndpoint: null,
   traceEndpoint: null,
@@ -34,7 +36,7 @@ export default () => ({
   // sidebar dropdown
   isLoadingStages: false,
   isLoadingJobs: false,
-  selectedStage: null,
+  selectedStage: __('More'),
   stages: [],
   jobs: [],
 });

app/assets/javascripts/notes/components/diff_with_note.vue

@@ -94,6 +94,7 @@ export default {
     class="diff-file file-holder"
   >
     <diff-file-header
+      :discussion-path="discussion.discussionPath"
       :diff-file="diffFile"
       :can-current-user-fork="false"
       :discussions-expanded="isDiscussionsExpanded"

app/assets/javascripts/performance_bar/components/performance_bar_app.vue

 <script>
 import $ from 'jquery';
+import { glEmojiTag } from '~/emoji';
 import detailedMetric from './detailed_metric.vue';
 import requestSelector from './request_selector.vue';
@@ -64,6 +65,16 @@ export default {
     lineProfileModal() {
       return $('#modal-peek-line-profile');
     },
+    hasHost() {
+      return this.currentRequest && this.currentRequest.details && this.currentRequest.details.host;
+    },
+    birdEmoji() {
+      if (this.hasHost && this.currentRequest.details.host.canary) {
+        return glEmojiTag('baby_chick');
+      }
+
+      return '';
+    },
   },
   mounted() {
     this.currentRequest = this.requestId;
@@ -93,9 +104,11 @@ export default {
         class="view"
       >
         <span
-          v-if="currentRequest.details"
+          v-if="hasHost"
           class="current-host"
+          :class="{ 'canary' : currentRequest.details.host.canary }"
         >
+          <span v-html="birdEmoji"></span>
           {{ currentRequest.details.host.hostname }}
         </span>
       </div>

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

@@ -162,18 +162,20 @@
           <span class="label-branch">
             <a :href="mr.targetBranchPath">{{ mr.targetBranch }}</a>
           </span>
-          with
-          <a
-            :href="mr.mergeCommitPath"
-            class="commit-sha js-mr-merged-commit-sha"
-            v-text="mr.shortMergeCommitSha"
-          >
-          </a>
-          <clipboard-button
-            :title="__('Copy commit SHA to clipboard')"
-            :text="mr.mergeCommitSha"
-            css-class="btn-default btn-transparent btn-clipboard js-mr-merged-copy-sha"
-          />
+          <template v-if="mr.mergeCommitSha">
+            with
+            <a
+              :href="mr.mergeCommitPath"
+              class="commit-sha js-mr-merged-commit-sha"
+              v-text="mr.shortMergeCommitSha"
+            >
+            </a>
+            <clipboard-button
+              :title="__('Copy commit SHA to clipboard')"
+              :text="mr.mergeCommitSha"
+              css-class="btn-default btn-transparent btn-clipboard js-mr-merged-copy-sha"
+            />
+          </template>
         </p>
         <p v-if="mr.sourceBranchRemoved">
           {{ s__("mrWidget|The source branch has been removed") }}

app/assets/stylesheets/framework/mixins.scss

@@ -12,6 +12,15 @@
   max-width: $max-width;
 }
+/**
+ * Mixin for fixed width container
+ */
+@mixin fixed-width-container {
+  max-width: $limited-layout-width - ($gl-padding * 2);
+  margin-left: auto;
+  margin-right: auto;
+}
+
 /*
  * Mixin for markdown tables
  */

app/assets/stylesheets/framework/variables.scss

@@ -605,6 +605,7 @@ $perf-bar-development: #4c1210;
 $perf-bar-bucket-bg: #111;
 $perf-bar-bucket-box-shadow-from: rgba($white-light, 0.2);
 $perf-bar-bucket-box-shadow-to: rgba($black, 0.25);
+$perf-bar-canary-text: $orange-400;
 /*
 Issuable warning