Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-10

# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	spec/javascripts/boards/mock_data.js

[ci skip]

PROCESS.md

@@ -216,6 +216,7 @@ the stable branch are:
 * Fixes or improvements to automated QA scenarios
 * [Documentation updates](https://docs.gitlab.com/ee/development/documentation/workflow.html#documentation-shipped-late) for changes in the same release
 * New or updated translations (as long as they do not touch application code)
+* Changes that are behind a feature flag and have the ~"feature flag" label
 
 During the feature freeze all merge requests that are meant to go into the
 upcoming release should have the correct milestone assigned _and_ the

app/assets/javascripts/boards/index.js

@@ -16,6 +16,7 @@ import boardsStore from './stores/boards_store';
 import ModalStore from './stores/modal_store';
 import modalMixin from './mixins/modal_mixins';
 import './filters/due_date_filters';
+<<<<<<< HEAD
 import Board from 'ee/boards/components/board';
 import BoardSidebar from 'ee/boards/components/board_sidebar';
 import initNewListDropdown from './components/new_list_dropdown';
@@ -32,11 +33,23 @@ import collapseIcon from 'ee/boards/icons/fullscreen_collapse.svg';
 import expandIcon from 'ee/boards/icons/fullscreen_expand.svg';
 import tooltip from '~/vue_shared/directives/tooltip';
 
+=======
+import Board from './components/board';
+import BoardSidebar from './components/board_sidebar';
+import initNewListDropdown from './components/new_list_dropdown';
+import BoardAddIssuesModal from './components/modal/index.vue';
+import '~/vue_shared/vue_resource_interceptor';
+import { NavigationType } from '~/lib/utils/common_utils';
+
+>>>>>>> upstream/master
 let issueBoardsApp;
 
 export default () => {
   const $boardApp = document.getElementById('board-app');
+<<<<<<< HEAD
   const issueBoardsContent = document.querySelector('.content-wrapper > .js-focus-mode-board');
+=======
+>>>>>>> upstream/master
 
   // check for browser back and trigger a hard reload to circumvent browser caching.
   window.addEventListener('pageshow', (event) => {
@@ -121,7 +134,10 @@ export default () => {
           this.state.lists = _.sortBy(this.state.lists, 'position');
 
           boardsStore.addBlankState();
+<<<<<<< HEAD
           boardsStore.addPromotionState();
+=======
+>>>>>>> upstream/master
           this.loading = false;
         })
         .catch(() => {
@@ -187,7 +203,10 @@ export default () => {
     el: document.getElementById('js-add-list'),
     data: {
       filters: boardsStore.state.filters,
+<<<<<<< HEAD
       milestoneTitle: $boardApp.dataset.boardMilestoneTitle,
+=======
+>>>>>>> upstream/master
     },
     mounted() {
       initNewListDropdown();
@@ -248,8 +267,11 @@ export default () => {
         return {
           modal: ModalStore.store,
           store: boardsStore.state,
+<<<<<<< HEAD
           isFullscreen: false,
           focusModeAvailable: $boardApp.hasAttribute('data-focus-mode-available'),
+=======
+>>>>>>> upstream/master
           canAdminList: this.$options.el.hasAttribute('data-can-admin-list'),
         };
       },

app/assets/javascripts/boards/models/list.js

@@ -6,7 +6,10 @@ import ListLabel from '~/vue_shared/models/label';
 import ListAssignee from '~/vue_shared/models/assignee';
 import { urlParamsToObject } from '~/lib/utils/common_utils';
 import boardsStore from '../stores/boards_store';
+<<<<<<< HEAD
 import ListMilestone from './milestone';
+=======
+>>>>>>> upstream/master
 
 const PER_PAGE = 20;
 

app/assets/javascripts/boards/stores/boards_store.js

@@ -184,8 +184,11 @@ const boardsStore = {
   }
 };
 
+<<<<<<< HEAD
 BoardsStoreEE.initEESpecific(boardsStore);
 
+=======
+>>>>>>> upstream/master
 // hacks added in order to allow milestone_select to function properly
 // TODO: remove these
 

app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue

@@ -38,14 +38,18 @@ export default {
       return this.modifiedFilesLength ? 'multi-file-modified' : '';
     },
     additionsTooltip() {
-      return sprintf(n__('1 %{type} addition', '%{count} %{type} additions', this.addedFilesLength), {
+      return sprintf(
+        n__('1 %{type} addition', '%{count} %{type} additions', this.addedFilesLength),
+        {
           type: this.title.toLowerCase(),
           count: this.addedFilesLength,
-      });
+        },
+      );
     },
     modifiedTooltip() {
       return sprintf(
-        n__('1 %{type} modification', '%{count} %{type} modifications', this.modifiedFilesLength), {
+        n__('1 %{type} modification', '%{count} %{type} modifications', this.modifiedFilesLength),
+        {
           type: this.title.toLowerCase(),
           count: this.modifiedFilesLength,
         },

app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue

@@ -25,10 +25,7 @@ export default {
       return `discard-file-${this.path}`;
     },
     modalTitle() {
-      return sprintf(
-        __('Discard changes to %{path}?'),
-        { path: this.path },
-      );
+      return sprintf(__('Discard changes to %{path}?'), { path: this.path });
     },
   },
   methods: {

app/assets/javascripts/ide/components/ide_side_bar.vue

@@ -24,13 +24,7 @@ export default {
     IdeProjectHeader,
   },
   computed: {
-    ...mapState([
-      'loading',
-      'currentActivityView',
-      'changedFiles',
-      'stagedFiles',
-      'lastCommitMsg',
-    ]),
+    ...mapState(['loading', 'currentActivityView', 'changedFiles', 'stagedFiles', 'lastCommitMsg']),
     ...mapGetters(['currentProject', 'someUncommitedChanges']),
     showSuccessMessage() {
       return (

app/assets/javascripts/ide/components/merge_requests/list.vue

@@ -37,14 +37,10 @@ export default {
       return this.hasSearchFocus && !this.search && !this.currentSearchType;
     },
     type() {
-      return this.currentSearchType
-        ? this.currentSearchType.type
-        : '';
+      return this.currentSearchType ? this.currentSearchType.type : '';
     },
     searchTokens() {
-      return this.currentSearchType
-        ? [this.currentSearchType]
-        : [];
+      return this.currentSearchType ? [this.currentSearchType] : [];
     },
   },
   watch: {

app/assets/javascripts/ide/components/nav_dropdown_button.vue

@@ -13,9 +13,7 @@ export default {
   computed: {
     ...mapState(['currentBranchId', 'currentMergeRequestId']),
     mergeRequestLabel() {
-      return this.currentMergeRequestId
-        ? `!${this.currentMergeRequestId}`
-        : EMPTY_LABEL;
+      return this.currentMergeRequestId ? `!${this.currentMergeRequestId}` : EMPTY_LABEL;
     },
     branchLabel() {
       return this.currentBranchId || EMPTY_LABEL;

app/assets/javascripts/ide/components/panes/right.vue

@@ -43,34 +43,25 @@ export default {
         {
           show: this.currentMergeRequestId,
           title: __('Merge Request'),
-          views: [
-            rightSidebarViews.mergeRequestInfo,
-          ],
+          views: [rightSidebarViews.mergeRequestInfo],
           icon: 'text-description',
         },
         {
           show: true,
           title: __('Pipelines'),
-          views: [
-            rightSidebarViews.pipelines,
-            rightSidebarViews.jobsDetail,
-          ],
+          views: [rightSidebarViews.pipelines, rightSidebarViews.jobsDetail],
           icon: 'rocket',
         },
         {
           show: this.showLivePreview,
           title: __('Live preview'),
-          views: [
-            rightSidebarViews.clientSidePreview,
-          ],
+          views: [rightSidebarViews.clientSidePreview],
           icon: 'live-preview',
         },
       ];
     },
     tabs() {
-      return this.defaultTabs
-        .concat(this.extensionTabs)
-        .filter(tab => tab.show);
+      return this.defaultTabs.concat(this.extensionTabs).filter(tab => tab.show);
     },
     tabViews() {
       return _.flatten(this.tabs.map(tab => tab.views));

app/assets/javascripts/ide/components/repo_editor.vue

@@ -25,12 +25,7 @@ export default {
     ...mapState('rightPane', {
       rightPaneIsOpen: 'isOpen',
     }),
-    ...mapState([
-      'rightPanelCollapsed',
-      'viewer',
-      'panelResizing',
-      'currentActivityView',
-    ]),
+    ...mapState(['rightPanelCollapsed', 'viewer', 'panelResizing', 'currentActivityView']),
     ...mapGetters([
       'currentMergeRequest',
       'getStagedFile',

app/assets/javascripts/ide/components/shared/tokened_input.vue

@@ -30,9 +30,7 @@ export default {
   },
   computed: {
     placeholderText() {
-      return this.tokens.length
-        ? ''
-        : this.placeholder;
+      return this.tokens.length ? '' : this.placeholder;
     },
   },
   watch: {

app/assets/javascripts/ide/index.js

@@ -21,10 +21,7 @@ Vue.use(Translate);
 export function initIde(el, options = {}) {
   if (!el) return null;
 
-  const {
-    extraInitialData = () => ({}),
-    rootComponent = ide,
-  } = options;
+  const { extraInitialData = () => ({}), rootComponent = ide } = options;
 
   return new Vue({
     el,

app/assets/javascripts/ide/lib/diff/diff.js

@@ -11,14 +11,16 @@ export const computeDiff = (originalContent, newContent) => {
     if (findOnLine) {
       Object.assign(findOnLine, change, {
         modified: true,
-        endLineNumber: (lineNumber + change.count) - 1,
+        endLineNumber: lineNumber + change.count - 1,
       });
     } else if ('added' in change || 'removed' in change) {
-      acc.push(Object.assign({}, change, {
+      acc.push(
+        Object.assign({}, change, {
           lineNumber,
           modified: undefined,
-        endLineNumber: (lineNumber + change.count) - 1,
-      }));
+          endLineNumber: lineNumber + change.count - 1,
+        }),
+      );
     }
 
     if (!change.removed) {

app/assets/javascripts/ide/lib/diff/diff_worker.js

 import { computeDiff } from './diff';
 
 // eslint-disable-next-line no-restricted-globals
-self.addEventListener('message', (e) => {
+self.addEventListener('message', e => {
   const { data } = e;
 
   // eslint-disable-next-line no-restricted-globals

app/assets/javascripts/ide/stores/actions/project.js

@@ -125,10 +125,7 @@ export const showBranchNotFoundError = ({ dispatch }, branchId) => {
   });
 };
 
-export const openBranch = (
-  { dispatch, state },
-  { projectId, branchId, basePath },
-) => {
+export const openBranch = ({ dispatch, state }, { projectId, branchId, basePath }) => {
   dispatch('setCurrentBranchId', branchId);
 
   dispatch('getBranchData', {
@@ -136,12 +133,10 @@ export const openBranch = (
     branchId,
   });
 
-  return (
-    dispatch('getFiles', {
+  return dispatch('getFiles', {
     projectId,
     branchId,
-    })
-    .then(() => {
+  }).then(() => {
     if (basePath) {
       const path = basePath.slice(-1) === '/' ? basePath.slice(0, -1) : basePath;
       const treeEntryKey = Object.keys(state.entries).find(
@@ -153,6 +148,5 @@ export const openBranch = (
         dispatch('handleTreeEntryAction', treeEntry);
       }
     }
-    })
-  );
+  });
 };

app/assets/javascripts/ide/stores/modules/merge_requests/actions.js

@@ -3,8 +3,7 @@ import Api from '../../../../api';
 import { scopes } from './constants';
 import * as types from './mutation_types';
 
-export const requestMergeRequests = ({ commit }) =>
-  commit(types.REQUEST_MERGE_REQUESTS);
+export const requestMergeRequests = ({ commit }) => commit(types.REQUEST_MERGE_REQUESTS);
 export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }) => {
   dispatch(
     'setErrorMessage',

app/assets/javascripts/issue_show/components/app.vue

 <script>
-  import Visibility from 'visibilityjs';
-  import { visitUrl } from '../../lib/utils/url_utility';
-  import Poll from '../../lib/utils/poll';
-  import eventHub from '../event_hub';
-  import Service from '../services/index';
-  import Store from '../stores';
-  import titleComponent from './title.vue';
-  import descriptionComponent from './description.vue';
-  import editedComponent from './edited.vue';
-  import formComponent from './form.vue';
-  import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
+import Visibility from 'visibilityjs';
+import { visitUrl } from '../../lib/utils/url_utility';
+import Poll from '../../lib/utils/poll';
+import eventHub from '../event_hub';
+import Service from '../services/index';
+import Store from '../stores';
+import titleComponent from './title.vue';
+import descriptionComponent from './description.vue';
+import editedComponent from './edited.vue';
+import formComponent from './form.vue';
+import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
 
-  export default {
+export default {
   components: {
     descriptionComponent,
     titleComponent,
     editedComponent,
     formComponent,
   },
-    mixins: [
-      recaptchaModalImplementor,
-    ],
+  mixins: [recaptchaModalImplementor],
   props: {
     endpoint: {
       required: true,
@@ -158,10 +156,8 @@
       return !!this.state.updatedAt;
     },
     issueChanged() {
-        const descriptionChanged =
-          this.initialDescriptionText !== this.store.formState.description;
-        const titleChanged =
-          this.initialTitleText !== this.store.formState.title;
+      const descriptionChanged = this.initialDescriptionText !== this.store.formState.description;
+      const titleChanged = this.initialTitleText !== this.store.formState.title;
       return descriptionChanged || titleChanged;
     },
   },
@@ -227,10 +223,11 @@
     },
 
     updateIssuable() {
-        return this.service.updateIssuable(this.store.formState)
+      return this.service
+        .updateIssuable(this.store.formState)
         .then(res => res.data)
         .then(data => this.checkForSpam(data))
-          .then((data) => {
+        .then(data => {
           if (window.location.pathname !== data.web_url) {
             visitUrl(data.web_url);
           }
@@ -238,11 +235,11 @@
           return this.service.getData();
         })
         .then(res => res.data)
-          .then((data) => {
+        .then(data => {
           this.store.updateState(data);
           eventHub.$emit('close.form');
         })
-          .catch((error) => {
+        .catch(error => {
           if (error && error.name === 'SpamError') {
             this.openRecaptcha();
           } else {
@@ -261,9 +258,10 @@
     },
 
     deleteIssuable() {
-        this.service.deleteIssuable()
+      this.service
+        .deleteIssuable()
         .then(res => res.data)
-          .then((data) => {
+        .then(data => {
           // Stop the poll so we don't get 404's with the issuable not existing
           this.poll.stop();
 
@@ -275,7 +273,7 @@
         });
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/description.vue

 <script>
-  import $ from 'jquery';
-  import animateMixin from '../mixins/animate';
-  import TaskList from '../../task_list';
-  import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
+import $ from 'jquery';
+import animateMixin from '../mixins/animate';
+import TaskList from '../../task_list';
+import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
 
-  export default {
-    mixins: [
-      animateMixin,
-      recaptchaModalImplementor,
-    ],
+export default {
+  mixins: [animateMixin, recaptchaModalImplementor],
 
   props: {
     canUpdate: {
@@ -94,9 +91,7 @@
       if (taskRegexMatches) {
         $tasks.text(this.taskStatus);
         $tasksShort.text(
-            `${taskRegexMatches[1]}/${taskRegexMatches[2]} task${taskRegexMatches[2] > 1 ?
-            's' :
-            ''}`,
+          `${taskRegexMatches[1]}/${taskRegexMatches[2]} task${taskRegexMatches[2] > 1 ? 's' : ''}`,
         );
       } else {
         $tasks.text('');
@@ -104,7 +99,7 @@
       }
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/edit_actions.vue

 <script>
-  import { __, sprintf } from '~/locale';
-  import updateMixin from '../mixins/update';
-  import eventHub from '../event_hub';
+import { __, sprintf } from '~/locale';
+import updateMixin from '../mixins/update';
+import eventHub from '../event_hub';
 
-  const issuableTypes = {
+const issuableTypes = {
   issue: __('Issue'),
   epic: __('Epic'),
-  };
+};
 
-  export default {
+export default {
   mixins: [updateMixin],
   props: {
     canDestroy: {
@@ -58,7 +58,7 @@
       }
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/edited.vue

 <script>
-  import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
+import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
 
-  export default {
+export default {
   components: {
     timeAgoTooltip,
   },
@@ -27,7 +27,7 @@
       return this.updatedByName && this.updatedByPath;
     },
   },
-  };
+};
 </script>
 
 <template>
@@ -53,4 +53,3 @@
     </span>
   </small>
 </template>
-

app/assets/javascripts/issue_show/components/fields/description.vue

 <script>
-  import updateMixin from '../../mixins/update';
-  import markdownField from '../../../vue_shared/components/markdown/field.vue';
+import updateMixin from '../../mixins/update';
+import markdownField from '../../../vue_shared/components/markdown/field.vue';
 
-  export default {
+export default {
   components: {
     markdownField,
   },
@@ -39,7 +39,7 @@
   mounted() {
     this.$refs.textarea.focus();
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/fields/description_template.vue

 <script>
-  import $ from 'jquery';
-  import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
+import $ from 'jquery';
+import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
 
-  export default {
+export default {
   props: {
     formState: {
       type: Object,
@@ -30,7 +30,7 @@
   mounted() {
     // Create the editor for the template
     const editor = document.querySelector('.detail-page-description .note-textarea') || {};
-      editor.setValue = (val) => {
+    editor.setValue = val => {
       this.formState.description = val;
     };
     editor.getValue = () => this.formState.description;
@@ -40,7 +40,7 @@
       editor,
     });
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/fields/title.vue

 <script>
-  import updateMixin from '../../mixins/update';
+import updateMixin from '../../mixins/update';
 
-  export default {
+export default {
   mixins: [updateMixin],
   props: {
     formState: {
@@ -9,7 +9,7 @@
       required: true,
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/form.vue

 <script>
-  import lockedWarning from './locked_warning.vue';
-  import titleField from './fields/title.vue';
-  import descriptionField from './fields/description.vue';
-  import editActions from './edit_actions.vue';
-  import descriptionTemplate from './fields/description_template.vue';
+import lockedWarning from './locked_warning.vue';
+import titleField from './fields/title.vue';
+import descriptionField from './fields/description.vue';
+import editActions from './edit_actions.vue';
+import descriptionTemplate from './fields/description_template.vue';
 
-  export default {
+export default {
   components: {
     lockedWarning,
     titleField,
@@ -73,7 +73,7 @@
       return this.issuableTemplates.length;
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/components/locked_warning.vue

 <script>
-  export default {
+export default {
   computed: {
     currentPath() {
       return window.location.pathname;
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/issue_show/stores/index.js

@@ -25,8 +25,10 @@ export default class Store {
   }
 
   stateShouldUpdate(data) {
-    return this.state.titleText !== data.title_text ||
-      this.state.descriptionText !== data.description_text;
+    return (
+      this.state.titleText !== data.title_text ||
+      this.state.descriptionText !== data.description_text
+    );
   }
 
   setFormState(state) {

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

 <script>
-  import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-  import timeagoMixin from '~/vue_shared/mixins/timeago';
+import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import timeagoMixin from '~/vue_shared/mixins/timeago';
 
-  export default {
+export default {
   components: {
     TimeagoTooltip,
   },
-    mixins: [
-      timeagoMixin,
-    ],
+  mixins: [timeagoMixin],
   props: {
     artifact: {
       type: Object,
@@ -24,7 +22,7 @@
       return this.artifact.expired === false;
     },
   },
-  };
+};
 </script>
 <template>
   <div class="block">

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

 <script>
-  import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
+import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 
-  export default {
+export default {
   components: {
     ClipboardButton,
   },
@@ -20,7 +20,7 @@
       required: true,
     },
   },
-  };
+};
 </script>
 <template>
   <div

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

 <script>
-  export default {
+export default {
   props: {
     illustrationPath: {
       type: String,
@@ -32,7 +32,7 @@
       },
     },
   },
-  };
+};
 </script>
 <template>
   <div class="row empty-state">

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

 <script>
-  import _ from 'underscore';
-  import CiIcon from '~/vue_shared/components/ci_icon.vue';
-  import { sprintf, __ } from '../../locale';
+import _ from 'underscore';
+import CiIcon from '~/vue_shared/components/ci_icon.vue';
+import { sprintf, __ } from '../../locale';
 
-  export default {
+export default {
   components: {
     CiIcon,
   },
@@ -107,7 +107,9 @@
       return !_.isEmpty(this.deploymentStatus.environment);
     },
     lastDeploymentPath() {
-        return !_.isEmpty(this.lastDeployment.deployable) ? this.lastDeployment.deployable.build_path : '';
+      return !_.isEmpty(this.lastDeployment.deployable)
+        ? this.lastDeployment.deployable.build_path
+        : '';
     },
   },
   methods: {
@@ -123,7 +125,7 @@
       );
     },
   },
-  };
+};
 </script>
 <template>
   <div class="prepend-top-default js-environment-container">

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

 <script>
-  import _ from 'underscore';
-  import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import _ from 'underscore';
+import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 
-  export default {
+export default {
   components: {
     TimeagoTooltip,
   },
@@ -22,7 +22,7 @@
       return !_.isEmpty(this.user);
     },
   },
-  };
+};
 </script>
 <template>
   <div class="prepend-top-default js-build-erased">

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

 <script>
-  export default {
+export default {
   name: 'JobLog',
   props: {
     trace: {
@@ -11,7 +11,7 @@
       required: true,
     },
   },
-  };
+};
 </script>
 <template>
   <pre class="build-trace">

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

 <script>
-  import { polyfillSticky } from '~/lib/utils/sticky';
-  import Icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '~/vue_shared/directives/tooltip';
-  import { numberToHumanSize } from '~/lib/utils/number_utils';
-  import { sprintf } from '~/locale';
+import { polyfillSticky } from '~/lib/utils/sticky';
+import Icon from '~/vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
+import { numberToHumanSize } from '~/lib/utils/number_utils';
+import { sprintf } from '~/locale';
 
-  export default {
+export default {
   components: {
     Icon,
   },
@@ -62,8 +62,7 @@
       this.$emit('scrollJobLogBottom');
     },
   },
-
-  };
+};
 </script>
 <template>
   <div class="top-bar">

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

 <script>
-  import _ from 'underscore';
-  import CiIcon from '~/vue_shared/components/ci_icon.vue';
-  import Icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '~/vue_shared/directives/tooltip';
+import _ from 'underscore';
+import CiIcon from '~/vue_shared/components/ci_icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
 
-  export default {
+export default {
   components: {
     CiIcon,
     Icon,
@@ -30,7 +30,7 @@
       return `${_.escape(job.name)} - ${job.status.tooltip}`;
     },
   },
-  };
+};
 </script>
 <template>
   <div class="js-jobs-container builds-container">

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

 <script>
-  import _ from 'underscore';
-  import { mapActions, mapState } from 'vuex';
-  import timeagoMixin from '~/vue_shared/mixins/timeago';
-  import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
-  import Icon from '~/vue_shared/components/icon.vue';
-  import DetailRow from './sidebar_detail_row.vue';
-  import ArtifactsBlock from './artifacts_block.vue';
-  import TriggerBlock from './trigger_block.vue';
-  import CommitBlock from './commit_block.vue';
-  import StagesDropdown from './stages_dropdown.vue';
-  import JobsContainer from './jobs_container.vue';
+import _ from 'underscore';
+import { mapActions, mapState } from 'vuex';
+import timeagoMixin from '~/vue_shared/mixins/timeago';
+import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
+import Icon from '~/vue_shared/components/icon.vue';
+import DetailRow from './sidebar_detail_row.vue';
+import ArtifactsBlock from './artifacts_block.vue';
+import TriggerBlock from './trigger_block.vue';
+import CommitBlock from './commit_block.vue';
+import StagesDropdown from './stages_dropdown.vue';
+import JobsContainer from './jobs_container.vue';
 
-  export default {
+export default {
   name: 'JobSidebar',
   components: {
     ArtifactsBlock,
@@ -106,7 +106,7 @@
   methods: {
     ...mapActions(['fetchJobsForStage']),
   },
-  };
+};
 </script>
 <template>
   <aside

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

 <script>
-  export default {
+export default {
   name: 'SidebarDetailRow',
   props: {
     title: {
@@ -25,7 +25,7 @@
       return this.helpUrl.length > 0;
     },
   },
-  };
+};
 </script>
 <template>
   <p class="build-detail-row">

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

 <script>
-  import _ from 'underscore';
-  import CiIcon from '~/vue_shared/components/ci_icon.vue';
-  import Icon from '~/vue_shared/components/icon.vue';
-  import { __ } from '~/locale';
+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 {
+export default {
   components: {
     CiIcon,
     Icon,
@@ -44,7 +44,7 @@
       this.selectedStage = stage.name;
     },
   },
-  };
+};
 </script>
 <template>
   <div class="block-last dropdown">

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

 <script>
-  export default {
+export default {
   props: {
     trigger: {
       type: Object,
@@ -21,7 +21,7 @@
       this.areVariablesVisible = true;
     },
   },
-  };
+};
 </script>
 
 <template>

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

@@ -7,9 +7,10 @@ import mutations from './mutations';
 
 Vue.use(Vuex);
 
-export default () => new Vuex.Store({
+export default () =>
+  new Vuex.Store({
     actions,
     mutations,
     getters,
     state: state(),
-});
+  });

app/assets/javascripts/lib/utils/ajax_cache.js

@@ -4,7 +4,7 @@ import Cache from './cache';
 class AjaxCache extends Cache {
   constructor() {
     super();
-    this.pendingRequests = { };
+    this.pendingRequests = {};
   }
 
   override(endpoint, data) {
@@ -19,12 +19,13 @@ class AjaxCache extends Cache {
     let pendingRequest = this.pendingRequests[endpoint];
 
     if (!pendingRequest) {
-      pendingRequest = axios.get(endpoint)
+      pendingRequest = axios
+        .get(endpoint)
         .then(({ data }) => {
           this.internalStorage[endpoint] = data;
           delete this.pendingRequests[endpoint];
         })
-        .catch((e) => {
+        .catch(e => {
           const error = new Error(`${endpoint}: ${e.message}`);
           error.textStatus = e.message;
 

app/assets/javascripts/lib/utils/axios_utils.js

@@ -7,7 +7,7 @@ axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
 // Maintain a global counter for active requests
 // see: spec/support/wait_for_requests.rb
-axios.interceptors.request.use((config) => {
+axios.interceptors.request.use(config => {
   window.activeVueResources = window.activeVueResources || 0;
   window.activeVueResources += 1;
 
@@ -15,15 +15,18 @@ axios.interceptors.request.use((config) => {
 });
 
 // Remove the global counter
-axios.interceptors.response.use((config) => {
+axios.interceptors.response.use(
+  config => {
     window.activeVueResources -= 1;
 
     return config;
-}, (e) => {
+  },
+  e => {
     window.activeVueResources -= 1;
 
     return Promise.reject(e);
-});
+  },
+);
 
 export default axios;
 

app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js

@@ -93,9 +93,13 @@ export default class LinkedTabs {
 
     const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
 
-    window.history.replaceState({
+    window.history.replaceState(
+      {
         url: newState,
-    }, document.title, newState);
+      },
+      document.title,
+      newState,
+    );
     return newState;
   }
 

app/assets/javascripts/lib/utils/cache.js

 export default class Cache {
   constructor() {
-    this.internalStorage = { };
+    this.internalStorage = {};
   }
 
   get(key) {

app/assets/javascripts/lib/utils/datefix.js

-
-export const pad = (val, len = 2) => (`0${val}`).slice(-len);
+export const pad = (val, len = 2) => `0${val}`.slice(-len);
 
 /**
  * Formats dates in Pickaday
  * @param {String} dateString Date in yyyy-mm-dd format
  * @return {Date} UTC format
  */
-export const parsePikadayDate = (dateString) => {
+export const parsePikadayDate = dateString => {
   const parts = dateString.split('-');
   const year = parseInt(parts[0], 10);
   const month = parseInt(parts[1] - 1, 10);
@@ -20,7 +19,7 @@ export const parsePikadayDate = (dateString) => {
  * @param {Date} date UTC format
  * @return {String} Date formated in yyyy-mm-dd
  */
-export const pikadayToString = (date) => {
+export const pikadayToString = date => {
   const day = pad(date.getDate());
   const month = pad(date.getMonth() + 1);
   const year = date.getFullYear();

app/assets/javascripts/lib/utils/notify.js

@@ -8,7 +8,7 @@ function notificationGranted(message, opts, onclick) {
     return notification.close();
   }, 8000);
 
-  return notification.onclick = onclick || notification.close;
+  return (notification.onclick = onclick || notification.close);
 }
 
 function notifyPermissions() {
@@ -21,7 +21,7 @@ function notifyMe(message, body, icon, onclick) {
   var opts;
   opts = {
     body: body,
-    icon: icon
+    icon: icon,
   };
   // Let's check if the browser supports notifications
   if (!('Notification' in window)) {

app/assets/javascripts/lib/utils/pretty_time.js

@@ -27,10 +27,10 @@ export function parseSeconds(seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {})
 
   let unorderedMinutes = Math.abs(seconds / MINUTES_PER_HOUR);
 
-  return _.mapObject(timePeriodConstraints, (minutesPerPeriod) => {
+  return _.mapObject(timePeriodConstraints, minutesPerPeriod => {
     const periodCount = Math.floor(unorderedMinutes / minutesPerPeriod);
 
-    unorderedMinutes -= (periodCount * minutesPerPeriod);
+    unorderedMinutes -= periodCount * minutesPerPeriod;
 
     return periodCount;
   });
@@ -42,10 +42,14 @@ export function parseSeconds(seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {})
 */
 
 export function stringifyTime(timeObject) {
-  const reducedTime = _.reduce(timeObject, (memo, unitValue, unitName) => {
+  const reducedTime = _.reduce(
+    timeObject,
+    (memo, unitValue, unitName) => {
       const isNonZero = !!unitValue;
       return isNonZero ? `${memo} ${unitValue}${unitName.charAt(0)}` : memo;
-  }, '').trim();
+    },
+    '',
+  ).trim();
   return reducedTime.length ? reducedTime : '0m';
 }
 
@@ -55,7 +59,5 @@ export function stringifyTime(timeObject) {
 */
 
 export function abbreviateTime(timeStr) {
-  return timeStr.split(' ')
-    .filter(unitStr => unitStr.charAt(0) !== '0')[0];
+  return timeStr.split(' ').filter(unitStr => unitStr.charAt(0) !== '0')[0];
 }
-

app/assets/javascripts/lib/utils/regexp.js

@@ -5,6 +5,7 @@
 
 // Inspired by https://github.com/mishoo/UglifyJS/blob/2bc1d02363db3798d5df41fb5059a19edca9b7eb/lib/parse-js.js#L203
 // Unicode 6.1
-const unicodeLetters = '\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0\\u08A2-\\u08AC\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F0\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC';
+const unicodeLetters =
+  '\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0\\u08A2-\\u08AC\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F0\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC';
 
 export default { unicodeLetters };

app/assets/javascripts/lib/utils/simple_poll.js

@@ -2,7 +2,7 @@ export default (fn, interval = 2000, timeout = 60000) => {
   const startTime = Date.now();
 
   return new Promise((resolve, reject) => {
-    const stop = arg => ((arg instanceof Error) ? reject(arg) : resolve(arg));
+    const stop = arg => (arg instanceof Error ? reject(arg) : resolve(arg));
     const next = () => {
       if (Date.now() - startTime < timeout) {
         setTimeout(fn.bind(null, next, stop), interval);

app/assets/javascripts/lib/utils/sticky.js

@@ -24,7 +24,11 @@ export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => {
   } else if (top > stickyTop && el.classList.contains('is-stuck')) {
     el.classList.remove('is-stuck');
 
-    if (insertPlaceholder && el.nextElementSibling && el.nextElementSibling.classList.contains('sticky-placeholder')) {
+    if (
+      insertPlaceholder &&
+      el.nextElementSibling &&
+      el.nextElementSibling.classList.contains('sticky-placeholder')
+    ) {
       el.nextElementSibling.remove();
     }
   }
@@ -42,11 +46,19 @@ export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => {
 export const stickyMonitor = (el, stickyTop, insertPlaceholder = true) => {
   if (!el) return;
 
-  if (typeof CSS === 'undefined' || !(CSS.supports('(position: -webkit-sticky) or (position: sticky)'))) return;
+  if (
+    typeof CSS === 'undefined' ||
+    !CSS.supports('(position: -webkit-sticky) or (position: sticky)')
+  )
+    return;
 
-  document.addEventListener('scroll', () => isSticky(el, window.scrollY, stickyTop, insertPlaceholder), {
+  document.addEventListener(
+    'scroll',
+    () => isSticky(el, window.scrollY, stickyTop, insertPlaceholder),
+    {
       passive: true,
-  });
+    },
+  );
 };
 
 /**
@@ -55,6 +67,6 @@ export const stickyMonitor = (el, stickyTop, insertPlaceholder = true) => {
  * - If the current environment supports `position: sticky`, do nothing.
  * - Can receive an iterable element list (NodeList, jQuery collection, etc.) or single HTMLElement.
  */
-export const polyfillSticky = (el) => {
+export const polyfillSticky = el => {
   StickyFill.add(el);
 };

app/assets/javascripts/lib/utils/text_markdown.js

@@ -8,12 +8,18 @@ function selectedText(text, textarea) {
 
 function lineBefore(text, textarea) {
   var split;
-  split = text.substring(0, textarea.selectionStart).trim().split('\n');
+  split = text
+    .substring(0, textarea.selectionStart)
+    .trim()
+    .split('\n');
   return split[split.length - 1];
 }
 
 function lineAfter(text, textarea) {
-  return text.substring(textarea.selectionEnd).trim().split('\n')[0];
+  return text
+    .substring(textarea.selectionEnd)
+    .trim()
+    .split('\n')[0];
 }
 
 function blockTagText(text, textArea, blockTag, selected) {
@@ -27,7 +33,7 @@ function blockTagText(text, textArea, blockTag, selected) {
     }
     return selected;
   } else {
-    return blockTag + "\n" + selected + "\n" + blockTag;
+    return blockTag + '\n' + selected + '\n' + blockTag;
   }
 }
 
@@ -58,7 +64,14 @@ function moveCursor({ textArea, tag, wrapped, removedLastNewLine, select }) {
 }
 
 export function insertMarkdownText({ textArea, text, tag, blockTag, selected, wrap, select }) {
-  var textToInsert, inserted, selectedSplit, startChar, removedLastNewLine, removedFirstNewLine, currentLineEmpty, lastNewLine;
+  var textToInsert,
+    inserted,
+    selectedSplit,
+    startChar,
+    removedLastNewLine,
+    removedFirstNewLine,
+    currentLineEmpty,
+    lastNewLine;
   removedLastNewLine = false;
   removedFirstNewLine = false;
   currentLineEmpty = false;
@@ -94,21 +107,23 @@ export function insertMarkdownText({ textArea, text, tag, blockTag, selected, wr
     if (blockTag != null && blockTag !== '') {
       textToInsert = blockTagText(text, textArea, blockTag, selected);
     } else {
-      textToInsert = selectedSplit.map(function(val) {
+      textToInsert = selectedSplit
+        .map(function(val) {
           if (tag.indexOf(textPlaceholder) > -1) {
             return tag.replace(textPlaceholder, val);
           }
           if (val.indexOf(tag) === 0) {
-          return "" + (val.replace(tag, ''));
+            return '' + val.replace(tag, '');
           } else {
-          return "" + tag + val;
+            return '' + tag + val;
           }
-      }).join('\n');
+        })
+        .join('\n');
     }
   } else if (tag.indexOf(textPlaceholder) > -1) {
     textToInsert = tag.replace(textPlaceholder, selected);
   } else {
-    textToInsert = "" + startChar + tag + selected + (wrap ? tag : ' ');
+    textToInsert = '' + startChar + tag + selected + (wrap ? tag : ' ');
   }
 
   if (removedFirstNewLine) {
@@ -120,7 +135,13 @@ export function insertMarkdownText({ textArea, text, tag, blockTag, selected, wr
   }
 
   insertText(textArea, textToInsert);
-  return moveCursor({ textArea, tag: tag.replace(textPlaceholder, selected), wrap, removedLastNewLine, select });
+  return moveCursor({
+    textArea,
+    tag: tag.replace(textPlaceholder, selected),
+    wrap,
+    removedLastNewLine,
+    select,
+  });
 }
 
 function updateText({ textArea, tag, blockTag, wrap, select }) {
@@ -138,14 +159,17 @@ function replaceRange(s, start, end, substitute) {
 }
 
 export function addMarkdownListeners(form) {
-  return $('.js-md', form).off('click').on('click', function() {
+  return $('.js-md', form)
+    .off('click')
+    .on('click', function() {
       const $this = $(this);
       return updateText({
         textArea: $this.closest('.md-area').find('textarea'),
         tag: $this.data('mdTag'),
         blockTag: $this.data('mdBlock'),
         wrap: !$this.data('mdPrepend'),
-      select: $this.data('mdSelect') });
+        select: $this.data('mdSelect'),
+      });
     });
 }
 

app/assets/javascripts/lib/utils/text_utility.js

@@ -8,7 +8,7 @@
  * @returns {String}
  */
 export const addDelimiter = text =>
-  (text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') : text);
+  text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') : text;
 
 /**
  * Returns '99+' for numbers bigger than 99.
@@ -94,9 +94,7 @@ export function capitalizeFirstCharacter(text) {
  * @return {String}
  */
 export function getFirstCharacterCapitalized(text) {
-  return text
-    ? text.charAt(0).toUpperCase()
-    : '';
+  return text ? text.charAt(0).toUpperCase() : '';
 }
 
 /**
@@ -136,10 +134,9 @@ export const convertToSentenceCase = string => {
  * e.g. HelloWorld => Hello World
  *
  * @param {*} string
-*/
-export const splitCamelCase = string => (
+ */
+export const splitCamelCase = string =>
   string
     .replace(/([A-Z]+)([A-Z][a-z])/g, ' $1 $2')
     .replace(/([a-z\d])([A-Z])/g, '$1 $2')
-  .trim()
-);
+    .trim();

app/assets/javascripts/lib/utils/tick_formats.js

@@ -26,7 +26,7 @@ initDateFormats();
 
   see also https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#tickFormat
   */
-export const dateTickFormat = (date) => {
+export const dateTickFormat = date => {
   if (date.getDate() !== 1) {
     return dateTimeFormats.dayFormat.format(date);
   }

app/assets/javascripts/lib/utils/users_cache.js

@@ -7,8 +7,7 @@ class UsersCache extends Cache {
       return Promise.resolve(this.get(username));
     }
 
-    return Api.users('', { username })
-      .then(({ data }) => {
+    return Api.users('', { username }).then(({ data }) => {
       if (!data.length) {
         throw new Error(`User "${username}" could not be found!`);
       }

app/assets/javascripts/merge_conflicts/components/diff_file_editor.js

@@ -6,7 +6,7 @@ import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
 import { __ } from '~/locale';
 
-((global) => {
+(global => {
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.diffFileEditor = Vue.extend({
@@ -35,10 +35,10 @@ import { __ } from '~/locale';
     computed: {
       classObject() {
         return {
-          'saved': this.saved,
-          'is-loading': this.loading
+          saved: this.saved,
+          'is-loading': this.loading,
         };
-      }
+      },
     },
     watch: {
       ['file.showEditor'](val) {
@@ -49,7 +49,7 @@ import { __ } from '~/locale';
         }
 
         this.loadEditor();
-      }
+      },
     },
     mounted() {
       if (this.file.loadEditor) {
@@ -60,7 +60,8 @@ import { __ } from '~/locale';
       loadEditor() {
         this.loading = true;
 
-        axios.get(this.file.content_path)
+        axios
+          .get(this.file.content_path)
           .then(({ data }) => {
             const content = this.$el.querySelector('pre');
             const fileContent = document.createTextNode(data.content);
@@ -101,7 +102,7 @@ import { __ } from '~/locale';
       },
       acceptDiscardConfirmation(file) {
         this.onAcceptDiscardConfirmation(file);
-      }
-    }
+      },
+    },
   });
 })(window.gl || (window.gl = {}));

app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js

@@ -4,7 +4,7 @@ import Vue from 'vue';
 import actionsMixin from '../mixins/line_conflict_actions';
 import utilsMixin from '../mixins/line_conflict_utils';
 
-((global) => {
+(global => {
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.parallelConflictLines = Vue.extend({

app/assets/javascripts/merge_conflicts/merge_conflict_store.js

@@ -4,7 +4,7 @@ import $ from 'jquery';
 import Vue from 'vue';
 import Cookies from 'js-cookie';
 
-((global) => {
+(global => {
   global.mergeConflicts = global.mergeConflicts || {};
 
   const diffViewType = Cookies.get('diff_view');
@@ -17,11 +17,11 @@ import Cookies from 'js-cookie';
   const DEFAULT_RESOLVE_MODE = INTERACTIVE_RESOLVE_MODE;
   const VIEW_TYPES = {
     INLINE: 'inline',
-    PARALLEL: 'parallel'
+    PARALLEL: 'parallel',
   };
   const CONFLICT_TYPES = {
     TEXT: 'text',
-    TEXT_EDITOR: 'text-editor'
+    TEXT_EDITOR: 'text-editor',
   };
 
   global.mergeConflicts.mergeConflictsStore = {
@@ -31,7 +31,7 @@ import Cookies from 'js-cookie';
       isSubmitting: false,
       isParallel: diffViewType === VIEW_TYPES.PARALLEL,
       diffViewType: diffViewType,
-      conflictsData: {}
+      conflictsData: {},
     },
 
     setConflictsData(data) {
@@ -47,7 +47,7 @@ import Cookies from 'js-cookie';
     },
 
     decorateFiles(files) {
-      files.forEach((file) => {
+      files.forEach(file => {
         file.content = '';
         file.resolutionData = {};
         file.promptDiscardConfirmation = false;
@@ -72,7 +72,7 @@ import Cookies from 'js-cookie';
     setInlineLine(file) {
       file.inlineLines = [];
 
-      file.sections.forEach((section) => {
+      file.sections.forEach(section => {
         let currentLineType = 'new';
         const { conflict, lines, id } = section;
 
@@ -80,7 +80,7 @@ import Cookies from 'js-cookie';
           file.inlineLines.push(this.getHeadHeaderLine(id));
         }
 
-        lines.forEach((line) => {
+        lines.forEach(line => {
           const { type } = line;
 
           if ((type === 'new' || type === 'old') && currentLineType !== type) {
@@ -102,7 +102,7 @@ import Cookies from 'js-cookie';
       file.parallelLines = [];
       const linesObj = { left: [], right: [] };
 
-      file.sections.forEach((section) => {
+      file.sections.forEach(section => {
         const { conflict, lines, id } = section;
 
         if (conflict) {
@@ -110,7 +110,7 @@ import Cookies from 'js-cookie';
           linesObj.right.push(this.getHeadHeaderLine(id));
         }
 
-        lines.forEach((line) => {
+        lines.forEach(line => {
           const { type } = line;
 
           if (conflict) {
@@ -131,10 +131,7 @@ import Cookies from 'js-cookie';
       });
 
       for (let i = 0, len = linesObj.left.length; i < len; i += 1) {
-        file.parallelLines.push([
-          linesObj.right[i],
-          linesObj.left[i]
-        ]);
+        file.parallelLines.push([linesObj.right[i], linesObj.left[i]]);
       }
     },
 
@@ -159,9 +156,9 @@ import Cookies from 'js-cookie';
       const { files } = this.state.conflictsData;
       let count = 0;
 
-      files.forEach((file) => {
+      files.forEach(file => {
         if (file.type === CONFLICT_TYPES.TEXT) {
-          file.sections.forEach((section) => {
+          file.sections.forEach(section => {
             if (section.conflict) {
               count += 1;
             }
@@ -198,7 +195,7 @@ import Cookies from 'js-cookie';
         isHeader: true,
         isHead: true,
         isSelected: false,
-        isUnselected: false
+        isUnselected: false,
       };
     },
 
@@ -229,7 +226,7 @@ import Cookies from 'js-cookie';
         section: isHead ? 'head' : 'origin',
         richText: rich_text,
         isSelected: false,
-        isUnselected: false
+        isUnselected: false,
       };
     },
 
@@ -243,7 +240,7 @@ import Cookies from 'js-cookie';
         isHeader: true,
         isOrigin: true,
         isSelected: false,
-        isUnselected: false
+        isUnselected: false,
       };
     },
 
@@ -290,14 +287,14 @@ import Cookies from 'js-cookie';
     },
 
     restoreFileLinesState(file) {
-      file.inlineLines.forEach((line) => {
+      file.inlineLines.forEach(line => {
         if (line.hasConflict || line.isHeader) {
           line.isSelected = false;
           line.isUnselected = false;
         }
       });
 
-      file.parallelLines.forEach((lines) => {
+      file.parallelLines.forEach(lines => {
         const left = lines[0];
         const right = lines[1];
         const isLeftMatch = left.hasConflict || left.isHeader;
@@ -354,7 +351,7 @@ import Cookies from 'js-cookie';
       const initial = 'Commit to source branch';
       const inProgress = 'Committing...';
 
-      return this.state ? this.state.isSubmitting ? inProgress : initial : initial;
+      return this.state ? (this.state.isSubmitting ? inProgress : initial) : initial;
     },
 
     getCommitData() {
@@ -362,13 +359,13 @@ import Cookies from 'js-cookie';
 
       commitData = {
         commit_message: this.state.conflictsData.commitMessage,
-        files: []
+        files: [],
       };
 
-      this.state.conflictsData.files.forEach((file) => {
+      this.state.conflictsData.files.forEach(file => {
         const addFile = {
           old_path: file.old_path,
-          new_path: file.new_path
+          new_path: file.new_path,
         };
 
         if (file.type === CONFLICT_TYPES.TEXT) {
@@ -391,13 +388,13 @@ import Cookies from 'js-cookie';
     handleSelected(file, sectionId, selection) {
       Vue.set(file.resolutionData, sectionId, selection);
 
-      file.inlineLines.forEach((line) => {
+      file.inlineLines.forEach(line => {
         if (line.id === sectionId && (line.hasConflict || line.isHeader)) {
           this.markLine(line, selection);
         }
       });
 
-      file.parallelLines.forEach((lines) => {
+      file.parallelLines.forEach(lines => {
         const left = lines[0];
         const right = lines[1];
         const hasSameId = right.id === sectionId || left.id === sectionId;
@@ -430,6 +427,6 @@ import Cookies from 'js-cookie';
 
     fileTextTypePresent() {
       return this.state.conflictsData.files.some(f => f.type === CONFLICT_TYPES.TEXT);
-    }
+    },
   };
 })(window.gl || (window.gl = {}));

app/assets/javascripts/monitoring/components/graph.vue

@@ -148,7 +148,7 @@ export default {
       point = point.matrixTransform(this.$refs.graphData.getScreenCTM().inverse());
       point.x += 7;
 
-      this.seriesUnderMouse = this.timeSeries.filter((series) => {
+      this.seriesUnderMouse = this.timeSeries.filter(series => {
         const mouseX = series.timeSeriesScaleX.invert(point.x);
         let minDistance = Infinity;
 
@@ -221,21 +221,18 @@ export default {
         .scale(axisYScale)
         .ticks(measurements.yTicks);
 
-      d3
-        .select(this.$refs.baseSvg)
+      d3.select(this.$refs.baseSvg)
         .select('.x-axis')
         .call(xAxis);
 
       const width = this.graphWidth;
-      d3
-        .select(this.$refs.baseSvg)
+      d3.select(this.$refs.baseSvg)
         .select('.y-axis')
         .call(yAxis)
         .selectAll('.tick')
         .each(function createTickLines(d, i) {
           if (i > 0) {
-            d3
-              .select(this)
+            d3.select(this)
               .select('line')
               .attr('x2', width)
               .attr('class', 'axis-tick');

app/assets/javascripts/monitoring/components/graph/axis.vue

@@ -38,38 +38,25 @@ export default {
   computed: {
     textTransform() {
       const yCoordinate =
-        (this.graphHeight -
-          this.margin.top +
-          this.measurements.axisLabelLineOffset) /
-          2 || 0;
+        (this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset) / 2 || 0;
 
       return `translate(15, ${yCoordinate}) rotate(-90)`;
     },
 
     rectTransform() {
       const yCoordinate =
-        (this.graphHeight -
-          this.margin.top +
-          this.measurements.axisLabelLineOffset) /
-          2 +
+        (this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset) / 2 +
           this.yLabelWidth / 2 || 0;
 
       return `translate(0, ${yCoordinate}) rotate(-90)`;
     },
 
     xPosition() {
-      return (
-        (this.graphWidth + this.measurements.axisLabelLineOffset) / 2 -
-          this.margin.right || 0
-      );
+      return (this.graphWidth + this.measurements.axisLabelLineOffset) / 2 - this.margin.right || 0;
     },
 
     yPosition() {
-      return (
-        this.graphHeight -
-          this.margin.top +
-          this.measurements.axisLabelLineOffset || 0
-      );
+      return this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset || 0;
     },
 
     yAxisLabelSentenceCase() {

app/assets/javascripts/monitoring/components/graph/flag.vue

@@ -92,7 +92,8 @@ export default {
   methods: {
     seriesMetricValue(seriesIndex, series) {
       const indexFromCoordinates = this.currentCoordinates[series.metricTag]
-      ? this.currentCoordinates[series.metricTag].currentDataIndex : 0;
+        ? this.currentCoordinates[series.metricTag].currentDataIndex
+        : 0;
       const index = this.deploymentFlagData
         ? this.deploymentFlagData.seriesIndex
         : indexFromCoordinates;

app/assets/javascripts/monitoring/components/graph/track_info.vue

@@ -26,4 +26,3 @@ export default {
     {{ summaryMetrics }}
   </span>
 </template>
-

app/assets/javascripts/monitoring/components/graph/track_line.vue

@@ -33,4 +33,3 @@ export default {
     </svg>
   </td>
 </template>
-

app/assets/javascripts/monitoring/mixins/monitoring_mixins.js

@@ -6,7 +6,7 @@ const mixins = {
       if (!this.reducedDeploymentData) return false;
 
       let dataFound = false;
-      this.reducedDeploymentData = this.reducedDeploymentData.map((d) => {
+      this.reducedDeploymentData = this.reducedDeploymentData.map(d => {
         const deployment = d;
         if (d.xPos >= mouseXPos - 10 && d.xPos <= mouseXPos + 10 && !dataFound) {
           dataFound = d.xPos + 1;
@@ -61,7 +61,7 @@ const mixins = {
 
       this.currentCoordinates = {};
 
-      this.seriesUnderMouse.forEach((series) => {
+      this.seriesUnderMouse.forEach(series => {
         const currentDataIndex = bisectDate(series.values, this.hoverData.hoveredDate);
         const currentData = series.values[currentDataIndex];
         const currentX = Math.floor(series.timeSeriesScaleX(currentData.time));

app/assets/javascripts/monitoring/services/monitoring_service.js

@@ -8,7 +8,8 @@ const MAX_REQUESTS = 3;
 function backOffRequest(makeRequestCallback) {
   let requestCounter = 0;
   return backOff((next, stop) => {
-    makeRequestCallback().then((resp) => {
+    makeRequestCallback()
+      .then(resp => {
         if (resp.status === statusCodes.NO_CONTENT) {
           requestCounter += 1;
           if (requestCounter < MAX_REQUESTS) {
@@ -19,7 +20,8 @@ function backOffRequest(makeRequestCallback) {
         } else {
           stop(resp);
         }
-    }).catch(stop);
+      })
+      .catch(stop);
   });
 }
 
@@ -33,7 +35,7 @@ export default class MonitoringService {
   getGraphsData() {
     return backOffRequest(() => axios.get(this.metricsEndpoint))
       .then(resp => resp.data)
-      .then((response) => {
+      .then(response => {
         if (!response || !response.data) {
           throw new Error(s__('Metrics|Unexpected metrics data response from prometheus endpoint'));
         }
@@ -47,20 +49,25 @@ export default class MonitoringService {
     }
     return backOffRequest(() => axios.get(this.deploymentEndpoint))
       .then(resp => resp.data)
-      .then((response) => {
+      .then(response => {
         if (!response || !response.deployments) {
-          throw new Error(s__('Metrics|Unexpected deployment data response from prometheus endpoint'));
+          throw new Error(
+            s__('Metrics|Unexpected deployment data response from prometheus endpoint'),
+          );
         }
         return response.deployments;
       });
   }
 
   getEnvironmentsData() {
-    return axios.get(this.environmentsEndpoint)
+    return axios
+      .get(this.environmentsEndpoint)
       .then(resp => resp.data)
-    .then((response) => {
+      .then(response => {
         if (!response || !response.environments) {
-        throw new Error(s__('Metrics|There was an error fetching the environments data, please try again'));
+          throw new Error(
+            s__('Metrics|There was an error fetching the environments data, please try again'),
+          );
         }
         return response.environments;
       });

app/assets/javascripts/monitoring/utils/measurements.js

 export default {
-  small: { // Covers both xs and sm screen sizes
+  small: {
+    // Covers both xs and sm screen sizes
     margin: {
       top: 40,
       right: 40,
@@ -18,7 +19,8 @@ export default {
     },
     axisLabelLineOffset: -20,
   },
-  large: { // This covers both md and lg screen sizes
+  large: {
+    // This covers both md and lg screen sizes
     margin: {
       top: 80,
       right: 80,

app/assets/javascripts/monitoring/utils/multiple_time_series.js

@@ -66,7 +66,8 @@ function queryTimeSeries(query, graphDrawData, lineStyle) {
   // offset the same amount as the original data
   const [minX, maxX] = graphDrawData.xDom;
   const offset = d3.timeMinute(minX) - Number(minX);
-  const datesWithoutGaps = d3.timeSecond.every(60)
+  const datesWithoutGaps = d3.timeSecond
+    .every(60)
     .range(d3.timeMinute.offset(minX, -1), maxX)
     .map(d => d - offset);
 
@@ -208,9 +209,7 @@ export default function createTimeSeries(queries, graphWidth, graphHeight, graph
 
   const timeSeries = queries.reduce((series, query, index) => {
     const lineStyle = defaultStyleOrder[index % defaultStyleOrder.length];
-    return series.concat(
-      queryTimeSeries(query, graphDrawData, lineStyle),
-    );
+    return series.concat(queryTimeSeries(query, graphDrawData, lineStyle));
   }, []);
 
   return {

app/assets/javascripts/notebook/cells/code/index.vue

 <script>
-  import Prism from '../../lib/highlight';
-  import Prompt from '../prompt.vue';
+import Prism from '../../lib/highlight';
+import Prompt from '../prompt.vue';
 
-  export default {
+export default {
   components: {
     prompt: Prompt,
   },
@@ -39,7 +39,7 @@
   mounted() {
     Prism.highlightElement(this.$refs.code);
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/notebook/cells/markdown.vue

 <script>
-  /* global katex */
-  import marked from 'marked';
-  import sanitize from 'sanitize-html';
-  import Prompt from './prompt.vue';
+/* global katex */
+import marked from 'marked';
+import sanitize from 'sanitize-html';
+import Prompt from './prompt.vue';
 
-  const renderer = new marked.Renderer();
+const renderer = new marked.Renderer();
 
-  /*
+/*
     Regex to match KaTex blocks.
 
     Supports the following:
@@ -17,7 +17,7 @@
 
     The matched text then goes through the KaTex renderer & then outputs the HTML
   */
-  const katexRegexString = `(
+const katexRegexString = `(
     ^\\\\begin{[a-zA-Z]+}\\s
     |
     ^\\$\\$
@@ -32,14 +32,17 @@
     |
     \\$
   )
-  `.replace(/\s/g, '').trim();
+  `
+  .replace(/\s/g, '')
+  .trim();
 
-  renderer.paragraph = (t) => {
+renderer.paragraph = t => {
   let text = t;
   let inline = false;
 
   if (typeof katex !== 'undefined') {
-      const katexString = text.replace(/&amp;/g, '&')
+    const katexString = text
+      .replace(/&amp;/g, '&')
       .replace(/&=&/g, '\\space=\\space')
       .replace(/<(\/?)em>/g, '_');
     const regex = new RegExp(katexRegexString, 'gi');
@@ -64,14 +67,14 @@
   }
 
   return `<p class="${inline ? 'inline-katex' : ''}">${text}</p>`;
-  };
+};
 
-  marked.setOptions({
+marked.setOptions({
   sanitize: true,
   renderer,
-  });
+});
 
-  export default {
+export default {
   components: {
     prompt: Prompt,
   },
@@ -91,7 +94,7 @@
       });
     },
   },
-  };
+};
 </script>
 
 <template>
@@ -105,13 +108,13 @@
 </template>
 
 <style>
-  .markdown .katex {
+.markdown .katex {
   display: block;
   text-align: center;
-  }
+}
 
-  .markdown .inline-katex .katex {
+.markdown .inline-katex .katex {
   display: inline;
   text-align: initial;
-  }
+}
 </style>

app/assets/javascripts/notebook/cells/output/html.vue

 <script>
-  import sanitize from 'sanitize-html';
-  import Prompt from '../prompt.vue';
+import sanitize from 'sanitize-html';
+import Prompt from '../prompt.vue';
 
-  export default {
+export default {
   components: {
     prompt: Prompt,
   },
@@ -15,16 +15,14 @@
   computed: {
     sanitizedOutput() {
       return sanitize(this.rawCode, {
-          allowedTags: sanitize.defaults.allowedTags.concat([
-            'img', 'svg',
-          ]),
+        allowedTags: sanitize.defaults.allowedTags.concat(['img', 'svg']),
         allowedAttributes: {
           img: ['src'],
         },
       });
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/notebook/cells/output/image.vue

 <script>
-  import Prompt from '../prompt.vue';
+import Prompt from '../prompt.vue';
 
-  export default {
+export default {
   components: {
     prompt: Prompt,
   },
@@ -15,7 +15,7 @@
       required: true,
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/notebook/cells/output/index.vue

 <script>
-  import CodeCell from '../code/index.vue';
-  import Html from './html.vue';
-  import Image from './image.vue';
+import CodeCell from '../code/index.vue';
+import Html from './html.vue';
+import Image from './image.vue';
 
-  export default {
+export default {
   components: {
     'code-cell': CodeCell,
     'html-output': Html,
@@ -72,7 +72,7 @@
       return data;
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/javascripts/notebook/cells/prompt.vue

 <script>
-  export default {
+export default {
   props: {
     type: {
       type: String,
@@ -17,7 +17,7 @@
       return this.type !== '' && this.count;
     },
   },
-  };
+};
 </script>
 
 <template>
@@ -29,9 +29,9 @@
 </template>
 
 <style scoped>
-  .prompt {
+.prompt {
   padding: 0 10px;
   min-width: 7em;
   font-family: monospace;
-  }
+}
 </style>

app/assets/javascripts/notebook/index.vue

 <script>
-  import {
-    MarkdownCell,
-    CodeCell,
-  } from './cells';
+import { MarkdownCell, CodeCell } from './cells';
 
-  export default {
+export default {
   components: {
     'code-cell': CodeCell,
     'markdown-cell': MarkdownCell,
@@ -45,7 +42,7 @@
       return `${type}-cell`;
     },
   },
-  };
+};
 </script>
 
 <template>

app/assets/stylesheets/application.scss

@@ -17,7 +17,7 @@
  */
 
 @import "../../../node_modules/pikaday/scss/pikaday";
-@import "../../../node_modules/dropzone/dist/basic.css";
+@import "../../../node_modules/dropzone/dist/basic";
 
 /*
  * GitLab UI framework

app/views/devise/shared/_signup_box.html.haml

@@ -5,22 +5,22 @@
         = devise_error_messages!
       .form-group
         = f.label :name, 'Full name', class: 'label-bold'
-        = f.text_field :name, class: "form-control top", required: true, title: "This field is required."
+        = f.text_field :name, class: "form-control top qa-new-user-name", required: true, title: "This field is required."
       .username.form-group
         = f.label :username, class: 'label-bold'
-        = f.text_field :username, class: "form-control middle", pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, required: true, title: 'Please create a username with only alphanumeric characters.'
+        = f.text_field :username, class: "form-control middle qa-new-user-username", pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, required: true, title: 'Please create a username with only alphanumeric characters.'
         %p.validation-error.hide Username is already taken.
         %p.validation-success.hide Username is available.
         %p.validation-pending.hide Checking username availability...
       .form-group
         = f.label :email, class: 'label-bold'
-        = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
+        = f.email_field :email, class: "form-control middle qa-new-user-email", required: true, title: "Please provide a valid email address."
       .form-group
         = f.label :email_confirmation, class: 'label-bold'
-        = f.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address."
+        = f.email_field :email_confirmation, class: "form-control middle qa-new-user-email-confirmation", required: true, title: "Please retype the email address."
       .form-group.append-bottom-20#password-strength
         = f.label :password, class: 'label-bold'
-        = f.password_field :password, class: "form-control bottom", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters."
+        = f.password_field :password, class: "form-control bottom qa-new-user-password", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters."
         %p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters
       - if Gitlab::CurrentSettings.current_application_settings.enforce_terms?
         .form-group
@@ -34,4 +34,4 @@
       - if Gitlab::Recaptcha.enabled?
         = recaptcha_tags
       .submit-container
-        = f.submit "Register", class: "btn-register btn"
+        = f.submit "Register", class: "btn-register btn qa-new-user-register-button"

qa/qa/page/base.rb

@@ -32,6 +32,21 @@ module QA
         false
       end
 
+      def with_retry(max_attempts: 3, reload: false)
+        attempts = 0
+
+        while attempts < max_attempts
+          result = yield
+          return result if result
+
+          refresh if reload
+
+          attempts += 1
+        end
+
+        false
+      end
+
       def scroll_to(selector, text: nil)
         page.execute_script <<~JS
           var elements = Array.from(document.querySelectorAll('#{selector}'));

qa/qa/page/main/menu.rb

@@ -68,10 +68,6 @@ module QA
           end
         end
 
-        def assert_has_personal_area
-          raise "Failed to sign in" unless has_personal_area?
-        end
-
         private
 
         def within_top_menu

qa/qa/page/main/sign_up.rb

+# frozen_string_literal: true
+
 module QA
   module Page
     module Main
       class SignUp < Page::Base
         view 'app/views/devise/shared/_signup_box.html.haml' do
-          element :name, 'text_field :name'
-          element :username, 'text_field :username'
-          element :email_field, 'email_field :email'
-          element :email_confirmation, 'email_field :email_confirmation'
-          element :password, 'password_field :password'
-          element :register_button, 'submit "Register"'
+          element :new_user_name
+          element :new_user_username
+          element :new_user_email
+          element :new_user_email_confirmation
+          element :new_user_password
+          element :new_user_register_button
         end
 
         def sign_up!(user)
-          fill_in :new_user_name, with: user.name
-          fill_in :new_user_username, with: user.username
-          fill_in :new_user_email, with: user.email
-          fill_in :new_user_email_confirmation, with: user.email
-          fill_in :new_user_password, with: user.password
-          click_button 'Register'
+          fill_element :new_user_name, user.name
+          fill_element :new_user_username, user.username
+          fill_element :new_user_email, user.email
+          fill_element :new_user_email_confirmation, user.email
+          fill_element :new_user_password, user.password
+
+          signed_in = with_retry do
+            click_element :new_user_register_button
+
+            Page::Main::Menu.act { has_personal_area? }
+          end
 
-          Page::Main::Menu.act { assert_has_personal_area }
+          raise "Failed to register and sign in" unless signed_in
         end
       end
     end

scripts/trigger-build

@@ -68,11 +68,11 @@ module Trigger
 
     def base_variables
       {
-        'TOP_UPSTREAM_TRIGGER_PROJECT' => ENV['TOP_UPSTREAM_TRIGGER_PROJECT'] || ENV['CI_PROJECT_PATH'],
-        'UPSTREAM_TRIGGER_PROJECT' => ENV['CI_PROJECT_PATH'],
-        'UPSTREAM_TRIGGER_SOURCE' => ENV['TRIGGER_SOURCE'],
         'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'],
-        'TRIGGER_SOURCE' => ENV['CI_JOB_URL']
+        'TRIGGER_SOURCE' => ENV['CI_JOB_URL'],
+        'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'],
+        'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'],
+        'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA']
       }
     end
 

spec/fixtures/api/schemas/deployment.json

@@ -20,12 +20,35 @@
         "name"
       ],
       "properties": {
-        "name": { "type": "string" }
+        "name": { "type": "string" },
+        "ref_path": { "type": "string" }
       },
       "additionalProperties": false
     },
     "sha": { "type": "string" },
-    "tag": { "type": "boolean" }
+    "tag": { "type": "boolean" },
+    "user": {
+      "oneOf": [
+        { "type": "null" },
+        { "$ref": "entities/user.json" }
+      ]
+    },
+    "commit": {
+      "oneOf": [
+        { "type": "null" },
+        { "$ref": "entities/commit.json" }
+      ]
+    },
+    "deployable": {
+      "oneOf": [
+        { "type": "null" },
+        { "$ref": "job/job.json" }
+      ]
+    },
+    "manual_actions": {
+      "type": "array",
+      "items": { "$ref": "job/job.json" }
+    }
   },
   "additionalProperties": false
 }

spec/fixtures/api/schemas/entities/commit.json

@@ -17,11 +17,10 @@
         "author": {
           "oneOf": [
             { "type": "null" },
-            { "type": "user.json" }
+            { "$ref": "user.json" }
           ]
         }
-      },
-      "additionalProperties": false
+      }
     }
   ]
 }

spec/javascripts/boards/mock_data.js

 import BoardService from '~/boards/services/board_service';
 
+<<<<<<< HEAD
 export const boardObj = {
   id: 1,
   name: 'test',
   milestone_id: null,
 };
 
+=======
+>>>>>>> upstream/master
 export const listObj = {
   id: 300,
   position: 0,

spec/serializers/deployment_serializer_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe DeploymentSerializer do
+  set(:project) { create(:project, :repository) }
+  set(:user) { create(:user, email: project.commit.author_email) }
+
+  let(:resource) { create(:deployment, project: project, sha: project.commit.id) }
+  let(:serializer) { described_class.new(request) }
+
+  shared_examples 'json schema' do
+    let(:json_entity) { subject.as_json }
+
+    it 'matches deployment entity schema' do
+      expect(json_entity).to match_schema('deployment')
+    end
+  end
+
+  describe '#represent' do
+    subject { serializer.represent(resource) }
+
+    let(:request) { { project: project, current_user: user } }
+
+    it_behaves_like 'json schema'
+  end
+
+  describe '#represent_concise' do
+    subject { serializer.represent_concise(resource) }
+
+    let(:request) { { project: project } }
+
+    it_behaves_like 'json schema'
+  end
+end