Merge remote-tracking branch 'ee/master' into ee-test-pg-mysql

* ee/master: (112 commits)
  Resolve merge conflicts
  Fix pipeline quota link
  Show sub-nav under Merge Requests when issue tracker is non-default
  Revert "Fix registry for projects with uppercases in path"
  Fix registry for projects with uppercases in path
  Fix typo: NotImplemented -> NotImplementedError
  Move event icons into events_helper
  Reset New branch button when issue state changes
  Add link to environments on kubernetes.md
  Indent system notes on desktop screens
  Improve webpack-dev-server compatibility with non-localhost setups.
  Add changelog entry
  Fix recent searches icon alignment in Safari
  Use preload to avoid Rails using JOIN
  Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error
  Rename build minutes to pipeline minutes
  Remove IIFEs in boards_bundle.js
  Prepare for zero downtime migrations
  Fix filtered search input width for IE
  Fix the `gitlab:gitlab_shell:check` task
  ...

.gitlab/issue_templates/Bug.md

@@ -25,14 +25,20 @@ logs, and code as it's very hard to read otherwise.)
 
 #### Results of GitLab environment info
 
+<details>
+
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:env:info`)
 
 (For installations from source run and paste the output of:
 `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
 
+</details>
+
 #### Results of GitLab application Check
 
+<details>
+
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:check SANITIZE=true`)
 
@@ -41,6 +47,8 @@ logs, and code as it's very hard to read otherwise.)
 
 (we will only investigate if the tests are passing)
 
+</details>
+
 ### Possible fixes
 
 (If you can, link to the line of code that might be responsible for the problem)

Gemfile.lock

@@ -363,7 +363,7 @@ GEM
     grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
-    grpc (1.1.2)
+    grpc (1.2.2)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     gssapi (1.2.0)

app/assets/javascripts/boards/boards_bundle.js

@@ -101,6 +101,7 @@ $(() => {
 
             if (list.type === 'closed') {
               list.position = Infinity;
+              list.label = { description: 'Shows all closed issues. Moving an issue to this list closes it' };
             }
           });
 

app/assets/javascripts/boards/components/board.js

@@ -7,13 +7,12 @@ import boardBlankState from './board_blank_state';
 require('./board_delete');
 require('./board_list');
 
-(() => {
-  const Store = gl.issueBoards.BoardsStore;
+const Store = gl.issueBoards.BoardsStore;
 
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.Board = Vue.extend({
+gl.issueBoards.Board = Vue.extend({
   template: '#js-board-template',
   components: {
     boardList,
@@ -102,5 +101,4 @@ require('./board_list');
 
     this.sortable = Sortable.create(this.$el.parentNode, this.sortableOptions);
   },
-  });
-})();
+});

app/assets/javascripts/boards/components/board_delete.js

@@ -2,11 +2,10 @@
 
 import Vue from 'vue';
 
-(() => {
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.BoardDelete = Vue.extend({
+gl.issueBoards.BoardDelete = Vue.extend({
   props: {
     list: Object
   },
@@ -19,5 +18,4 @@ import Vue from 'vue';
       }
     }
   }
-  });
-})();
+});

app/assets/javascripts/boards/components/board_sidebar.js

@@ -8,13 +8,12 @@ import Vue from 'vue';
 
 require('./sidebar/remove_issue');
 
-(() => {
-  const Store = gl.issueBoards.BoardsStore;
+const Store = gl.issueBoards.BoardsStore;
 
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.BoardSidebar = Vue.extend({
+gl.issueBoards.BoardSidebar = Vue.extend({
   props: {
     currentUser: Object
   },
@@ -69,5 +68,4 @@ require('./sidebar/remove_issue');
   components: {
     removeBtn: gl.issueBoards.RemoveIssueBtn,
   },
-  });
-})();
+});

app/assets/javascripts/boards/components/issue_card_inner.js

 import Vue from 'vue';
 import eventHub from '../eventhub';
 
-(() => {
-  const Store = gl.issueBoards.BoardsStore;
+const Store = gl.issueBoards.BoardsStore;
 
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.IssueCardInner = Vue.extend({
+gl.issueBoards.IssueCardInner = Vue.extend({
   props: {
     issue: {
       type: Object,
@@ -137,5 +136,4 @@ import eventHub from '../eventhub';
       </div>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/empty_state.js

 import Vue from 'vue';
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalEmptyState = Vue.extend({
+gl.issueBoards.ModalEmptyState = Vue.extend({
   mixins: [gl.issueBoards.ModalMixins],
   data() {
     return ModalStore.store;
@@ -67,5 +66,4 @@ import Vue from 'vue';
       </div>
     </section>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/footer.js

@@ -5,10 +5,9 @@ import Vue from 'vue';
 
 require('./lists_dropdown');
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalFooter = Vue.extend({
+gl.issueBoards.ModalFooter = Vue.extend({
   mixins: [gl.issueBoards.ModalMixins],
   data() {
     return {
@@ -81,5 +80,4 @@ require('./lists_dropdown');
       </button>
     </footer>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/header.js

@@ -3,10 +3,9 @@ import modalFilters from './filters';
 
 require('./tabs');
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalHeader = Vue.extend({
+gl.issueBoards.ModalHeader = Vue.extend({
   mixins: [gl.issueBoards.ModalMixins],
   props: {
     projectId: {
@@ -78,5 +77,4 @@ require('./tabs');
       </div>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/index.js

@@ -8,10 +8,9 @@ require('./list');
 require('./footer');
 require('./empty_state');
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.IssuesModal = Vue.extend({
+gl.issueBoards.IssuesModal = Vue.extend({
   props: {
     blankStateImage: {
       type: String,
@@ -163,5 +162,4 @@ require('./empty_state');
       </div>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/list.js

@@ -3,10 +3,9 @@
 
 import Vue from 'vue';
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalList = Vue.extend({
+gl.issueBoards.ModalList = Vue.extend({
   props: {
     issueLinkBase: {
       type: String,
@@ -157,5 +156,4 @@ import Vue from 'vue';
       </div>
     </section>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/lists_dropdown.js

 import Vue from 'vue';
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalFooterListsDropdown = Vue.extend({
+gl.issueBoards.ModalFooterListsDropdown = Vue.extend({
   data() {
     return {
       modal: ModalStore.store,
@@ -53,5 +52,4 @@ import Vue from 'vue';
       </div>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/modal/tabs.js

 import Vue from 'vue';
 
-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalTabs = Vue.extend({
+gl.issueBoards.ModalTabs = Vue.extend({
   mixins: [gl.issueBoards.ModalMixins],
   data() {
     return ModalStore.store;
@@ -44,5 +43,4 @@ import Vue from 'vue';
       </ul>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/components/new_list_dropdown.js

 /* eslint-disable comma-dangle, func-names, no-new, space-before-function-paren, one-var */
 
-(() => {
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  const Store = gl.issueBoards.BoardsStore;
+const Store = gl.issueBoards.BoardsStore;
 
-  $(document).off('created.label').on('created.label', (e, label) => {
+$(document).off('created.label').on('created.label', (e, label) => {
   Store.new({
     title: label.title,
     position: Store.state.lists.length - 2,
@@ -17,9 +16,9 @@
       color: label.color
     }
   });
-  });
+});
 
-  gl.issueBoards.newListDropdownInit = () => {
+gl.issueBoards.newListDropdownInit = () => {
   $('.js-new-board-list').each(function () {
     const $this = $(this);
     new gl.CreateLabelDropdown($this.closest('.dropdown').find('.dropdown-new-label'), $this.data('namespace-path'), $this.data('project-path'));
@@ -72,5 +71,4 @@
       }
     });
   });
-  };
-})();
+};

app/assets/javascripts/boards/components/sidebar/remove_issue.js

@@ -3,13 +3,12 @@
 
 import Vue from 'vue';
 
-(() => {
-  const Store = gl.issueBoards.BoardsStore;
+const Store = gl.issueBoards.BoardsStore;
 
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.RemoveIssueBtn = Vue.extend({
+gl.issueBoards.RemoveIssueBtn = Vue.extend({
   props: {
     issue: {
       type: Object,
@@ -62,5 +61,4 @@ import Vue from 'vue';
       </button>
     </div>
   `,
-  });
-})();
+});

app/assets/javascripts/boards/mixins/modal_mixins.js

-(() => {
-  const ModalStore = gl.issueBoards.ModalStore;
+const ModalStore = gl.issueBoards.ModalStore;
 
-  gl.issueBoards.ModalMixins = {
+gl.issueBoards.ModalMixins = {
   methods: {
     toggleModal(toggle) {
       ModalStore.store.showAddIssuesModal = toggle;
@@ -10,5 +9,4 @@
       ModalStore.store.activeTab = tab;
     },
   },
-  };
-})();
+};

app/assets/javascripts/boards/mixins/sortable_default_options.js

 /* eslint-disable no-unused-vars, no-mixed-operators, comma-dangle */
 /* global DocumentTouch */
 
-((w) => {
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.onStart = () => {
+gl.issueBoards.onStart = () => {
   $('.has-tooltip').tooltip('hide')
     .tooltip('disable');
   document.body.classList.add('is-dragging');
-  };
+};
 
-  gl.issueBoards.onEnd = () => {
+gl.issueBoards.onEnd = () => {
   $('.has-tooltip').tooltip('enable');
   document.body.classList.remove('is-dragging');
-  };
+};
 
-  gl.issueBoards.touchEnabled = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch;
+gl.issueBoards.touchEnabled = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch;
 
-  gl.issueBoards.getBoardSortableDefaultOptions = (obj) => {
+gl.issueBoards.getBoardSortableDefaultOptions = (obj) => {
   const defaultSortOptions = {
     animation: 200,
     forceFallback: true,
@@ -35,5 +34,4 @@
 
   Object.keys(obj).forEach((key) => { defaultSortOptions[key] = obj[key]; });
   return defaultSortOptions;
-  };
-})(window);
+};

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

@@ -3,11 +3,10 @@
 
 import Cookies from 'js-cookie';
 
-(() => {
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  gl.issueBoards.BoardsStore = {
+gl.issueBoards.BoardsStore = {
   disabled: false,
   filter: {
     path: '',
@@ -132,5 +131,4 @@ import Cookies from 'js-cookie';
       history.pushState(null, null, `?${this.filter.path}`);
     }
   }
-  };
-})();
+};

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

-(() => {
-  window.gl = window.gl || {};
-  window.gl.issueBoards = window.gl.issueBoards || {};
+window.gl = window.gl || {};
+window.gl.issueBoards = window.gl.issueBoards || {};
 
-  class ModalStore {
+class ModalStore {
   constructor() {
     this.store = {
       columns: 3,
@@ -94,7 +93,6 @@
     return this.store.selectedIssues
       .filter(filteredIssue => filteredIssue.id === issue.id)[0];
   }
-  }
+}
 
-  gl.issueBoards.ModalStore = new ModalStore();
-})();
+gl.issueBoards.ModalStore = new ModalStore();

app/assets/javascripts/cycle_analytics/components/stage_code_component.js

@@ -2,10 +2,10 @@
 
 import Vue from 'vue';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageCodeComponent = Vue.extend({
+global.cycleAnalytics.StageCodeComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -43,5 +43,4 @@ import Vue from 'vue';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_issue_component.js

@@ -2,10 +2,10 @@
 
 import Vue from 'vue';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageIssueComponent = Vue.extend({
+global.cycleAnalytics.StageIssueComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -45,5 +45,4 @@ import Vue from 'vue';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_plan_component.js

@@ -2,10 +2,10 @@
 import Vue from 'vue';
 import iconCommit from '../svg/icon_commit.svg';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StagePlanComponent = Vue.extend({
+global.cycleAnalytics.StagePlanComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -47,5 +47,4 @@ import iconCommit from '../svg/icon_commit.svg';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_production_component.js

@@ -2,10 +2,10 @@
 
 import Vue from 'vue';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageProductionComponent = Vue.extend({
+global.cycleAnalytics.StageProductionComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -45,5 +45,4 @@ import Vue from 'vue';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_review_component.js

@@ -2,10 +2,10 @@
 
 import Vue from 'vue';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageReviewComponent = Vue.extend({
+global.cycleAnalytics.StageReviewComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -55,5 +55,4 @@ import Vue from 'vue';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_staging_component.js

@@ -2,10 +2,10 @@
 import Vue from 'vue';
 import iconBranch from '../svg/icon_branch.svg';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageStagingComponent = Vue.extend({
+global.cycleAnalytics.StageStagingComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -45,5 +45,4 @@ import iconBranch from '../svg/icon_branch.svg';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/stage_test_component.js

@@ -3,10 +3,10 @@ import Vue from 'vue';
 import iconBuildStatus from '../svg/icon_build_status.svg';
 import iconBranch from '../svg/icon_branch.svg';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.StageTestComponent = Vue.extend({
+global.cycleAnalytics.StageTestComponent = Vue.extend({
   props: {
     items: Array,
     stage: Object,
@@ -46,5 +46,4 @@ import iconBranch from '../svg/icon_branch.svg';
       </ul>
     </div>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/components/total_time_component.js

@@ -2,10 +2,10 @@
 
 import Vue from 'vue';
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  global.cycleAnalytics.TotalTimeComponent = Vue.extend({
+global.cycleAnalytics.TotalTimeComponent = Vue.extend({
   props: {
     time: Object,
   },
@@ -22,5 +22,4 @@ import Vue from 'vue';
       </template>
     </span>
   `,
-  });
-})(window.gl || (window.gl = {}));
+});

app/assets/javascripts/cycle_analytics/cycle_analytics_service.js

 /* eslint-disable no-param-reassign */
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
 
-  class CycleAnalyticsService {
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
+
+class CycleAnalyticsService {
   constructor(options) {
     this.requestPath = options.requestPath;
   }
@@ -35,7 +36,6 @@
       },
     });
   }
-  }
+}
 
-  global.cycleAnalytics.CycleAnalyticsService = CycleAnalyticsService;
-})(window.gl || (window.gl = {}));
+global.cycleAnalytics.CycleAnalyticsService = CycleAnalyticsService;

app/assets/javascripts/cycle_analytics/cycle_analytics_store.js

@@ -3,10 +3,10 @@
 require('../lib/utils/text_utility');
 const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
 
-((global) => {
-  global.cycleAnalytics = global.cycleAnalytics || {};
+const global = window.gl || (window.gl = {});
+global.cycleAnalytics = global.cycleAnalytics || {};
 
-  const EMPTY_STAGE_TEXTS = {
+const EMPTY_STAGE_TEXTS = {
   issue: 'The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.',
   plan: 'The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.',
   code: 'The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.',
@@ -14,9 +14,9 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
   review: 'The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.',
   staging: 'The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.',
   production: 'The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.',
-  };
+};
 
-  global.cycleAnalytics.CycleAnalyticsStore = {
+global.cycleAnalytics.CycleAnalyticsStore = {
   state: {
     summary: '',
     stats: '',
@@ -100,5 +100,4 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
   currentActiveStage() {
     return this.state.stages.find(stage => stage.active);
   },
-  };
-})(window.gl || (window.gl = {}));
+};

app/assets/javascripts/gfm_auto_complete.js

@@ -50,7 +50,7 @@ window.gl.GfmAutoComplete = {
     template: '<li>${title}</li>'
   },
   Loading: {
-    template: '<li style="pointer-events: none;"><i class="fa fa-refresh fa-spin"></i> Loading...</li>'
+    template: '<li style="pointer-events: none;"><i class="fa fa-spinner fa-spin"></i> Loading...</li>'
   },
   DefaultOptions: {
     sorter: function(query, items, searchKey) {

app/assets/javascripts/issue.js

@@ -20,57 +20,60 @@ class Issue {
       });
       Issue.initIssueBtnEventListeners();
     }
+
+    Issue.$btnNewBranch = $('#new-branch');
+
     Issue.initMergeRequests();
     Issue.initRelatedBranches();
     Issue.initCanCreateBranch();
   }
 
   static initIssueBtnEventListeners() {
-    var issueFailMessage;
-    issueFailMessage = 'Unable to update this issue at this time.';
-    return $('a.btn-close, a.btn-reopen').on('click', function(e) {
-      var $this, isClose, shouldSubmit, url;
+    const issueFailMessage = 'Unable to update this issue at this time.';
+
+    const closeButtons = $('a.btn-close');
+    const isClosedBadge = $('div.status-box-closed');
+    const isOpenBadge = $('div.status-box-open');
+    const projectIssuesCounter = $('.issue_counter');
+    const reopenButtons = $('a.btn-reopen');
+
+    return closeButtons.add(reopenButtons).on('click', function(e) {
+      var $this, shouldSubmit, url;
       e.preventDefault();
       e.stopImmediatePropagation();
       $this = $(this);
-      isClose = $this.hasClass('btn-close');
       shouldSubmit = $this.hasClass('btn-comment');
       if (shouldSubmit) {
         Issue.submitNoteForm($this.closest('form'));
       }
       $this.prop('disabled', true);
+      Issue.setNewBranchButtonState(true, null);
       url = $this.attr('href');
       return $.ajax({
         type: 'PUT',
-        url: url,
-        error: function(jqXHR, textStatus, errorThrown) {
-          var issueStatus;
-          issueStatus = isClose ? 'close' : 'open';
-          return new Flash(issueFailMessage, 'alert');
-        },
-        success: function(data, textStatus, jqXHR) {
+        url: url
+      }).fail(function(jqXHR, textStatus, errorThrown) {
+        new Flash(issueFailMessage);
+        Issue.initCanCreateBranch();
+      }).done(function(data, textStatus, jqXHR) {
         if ('id' in data) {
           $(document).trigger('issuable:change');
-            let total = Number($('.issue_counter').text().replace(/[^\d]/, ''));
-            if (isClose) {
-              $('a.btn-close').addClass('hidden');
-              $('a.btn-reopen').removeClass('hidden');
-              $('div.status-box-closed').removeClass('hidden');
-              $('div.status-box-open').addClass('hidden');
-              total -= 1;
-            } else {
-              $('a.btn-reopen').addClass('hidden');
-              $('a.btn-close').removeClass('hidden');
-              $('div.status-box-closed').addClass('hidden');
-              $('div.status-box-open').removeClass('hidden');
-              total += 1;
-            }
-            $('.issue_counter').text(gl.text.addDelimiter(total));
+
+          const isClosed = $this.hasClass('btn-close');
+          closeButtons.toggleClass('hidden', isClosed);
+          reopenButtons.toggleClass('hidden', !isClosed);
+          isClosedBadge.toggleClass('hidden', !isClosed);
+          isOpenBadge.toggleClass('hidden', isClosed);
+
+          let numProjectIssues = Number(projectIssuesCounter.text().replace(/[^\d]/, ''));
+          numProjectIssues = isClosed ? numProjectIssues - 1 : numProjectIssues + 1;
+          projectIssuesCounter.text(gl.text.addDelimiter(numProjectIssues));
         } else {
-            new Flash(issueFailMessage, 'alert');
-          }
-          return $this.prop('disabled', false);
+          new Flash(issueFailMessage);
         }
+
+        $this.prop('disabled', false);
+        Issue.initCanCreateBranch();
       });
     });
   }
@@ -86,9 +89,9 @@ class Issue {
   static initMergeRequests() {
     var $container;
     $container = $('#merge-requests');
-    return $.getJSON($container.data('url')).error(function() {
-      return new Flash('Failed to load referenced merge requests', 'alert');
-    }).success(function(data) {
+    return $.getJSON($container.data('url')).fail(function() {
+      return new Flash('Failed to load referenced merge requests');
+    }).done(function(data) {
       if ('html' in data) {
         return $container.html(data.html);
       }
@@ -98,9 +101,9 @@ class Issue {
   static initRelatedBranches() {
     var $container;
     $container = $('#related-branches');
-    return $.getJSON($container.data('url')).error(function() {
-      return new Flash('Failed to load related branches', 'alert');
-    }).success(function(data) {
+    return $.getJSON($container.data('url')).fail(function() {
+      return new Flash('Failed to load related branches');
+    }).done(function(data) {
       if ('html' in data) {
         return $container.html(data.html);
       }
@@ -108,24 +111,27 @@ class Issue {
   }
 
   static initCanCreateBranch() {
-    var $container;
-    $container = $('#new-branch');
     // If the user doesn't have the required permissions the container isn't
     // rendered at all.
-    if ($container.length === 0) {
+    if (Issue.$btnNewBranch.length === 0) {
       return;
     }
-    return $.getJSON($container.data('path')).error(function() {
-      $container.find('.unavailable').show();
-      return new Flash('Failed to check if a new branch can be created.', 'alert');
-    }).success(function(data) {
-      if (data.can_create_branch) {
-        $container.find('.available').show();
-      } else {
-        return $container.find('.unavailable').show();
-      }
+    return $.getJSON(Issue.$btnNewBranch.data('path')).fail(function() {
+      Issue.setNewBranchButtonState(false, false);
+      new Flash('Failed to check if a new branch can be created.');
+    }).done(function(data) {
+      Issue.setNewBranchButtonState(false, data.can_create_branch);
     });
   }
+
+  static setNewBranchButtonState(isPending, canCreate) {
+    if (Issue.$btnNewBranch.length === 0) {
+      return;
+    }
+
+    Issue.$btnNewBranch.find('.available').toggle(!isPending && canCreate);
+    Issue.$btnNewBranch.find('.unavailable').toggle(!isPending && !canCreate);
+  }
 }
 
 export default Issue;

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

-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len */
-
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len, vars-on-top */
 require('vendor/latinise');
 
-(function() {
-  (function(w) {
-    var base;
-    if (w.gl == null) {
+var base;
+var w = window;
+if (w.gl == null) {
   w.gl = {};
-    }
-    if ((base = w.gl).text == null) {
+}
+if ((base = w.gl).text == null) {
   base.text = {};
-    }
-    gl.text.addDelimiter = function(text) {
+}
+gl.text.addDelimiter = function(text) {
   return text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : text;
-    };
-    gl.text.highCountTrim = function(count) {
+};
+gl.text.highCountTrim = function(count) {
   return count > 99 ? '99+' : count;
-    };
-    gl.text.randomString = function() {
+};
+gl.text.randomString = function() {
   return Math.random().toString(36).substring(7);
-    };
-    gl.text.replaceRange = function(s, start, end, substitute) {
+};
+gl.text.replaceRange = function(s, start, end, substitute) {
   return s.substring(0, start) + substitute + s.substring(end);
-    };
-    gl.text.getTextWidth = function(text, font) {
+};
+gl.text.getTextWidth = function(text, font) {
   /**
   * Uses canvas.measureText to compute and return the width of the given text of given font in pixels.
   *
@@ -37,19 +35,19 @@ require('vendor/latinise');
   var context = canvas.getContext('2d');
   context.font = font;
   return context.measureText(text).width;
-    };
-    gl.text.selectedText = function(text, textarea) {
+};
+gl.text.selectedText = function(text, textarea) {
   return text.substring(textarea.selectionStart, textarea.selectionEnd);
-    };
-    gl.text.lineBefore = function(text, textarea) {
+};
+gl.text.lineBefore = function(text, textarea) {
   var split;
   split = text.substring(0, textarea.selectionStart).trim().split('\n');
   return split[split.length - 1];
-    };
-    gl.text.lineAfter = function(text, textarea) {
+};
+gl.text.lineAfter = function(text, textarea) {
   return text.substring(textarea.selectionEnd).trim().split('\n')[0];
-    };
-    gl.text.blockTagText = function(text, textArea, blockTag, selected) {
+};
+gl.text.blockTagText = function(text, textArea, blockTag, selected) {
   var lineAfter, lineBefore;
   lineBefore = this.lineBefore(text, textArea);
   lineAfter = this.lineAfter(text, textArea);
@@ -63,8 +61,8 @@ require('vendor/latinise');
   } else {
     return blockTag + "\n" + selected + "\n" + blockTag;
   }
-    };
-    gl.text.insertText = function(textArea, text, tag, blockTag, selected, wrap) {
+};
+gl.text.insertText = function(textArea, text, tag, blockTag, selected, wrap) {
   var insertText, inserted, selectedSplit, startChar, removedLastNewLine, removedFirstNewLine, currentLineEmpty, lastNewLine;
   removedLastNewLine = false;
   removedFirstNewLine = false;
@@ -132,8 +130,8 @@ require('vendor/latinise');
     } catch (error) {}
   }
   return this.moveCursor(textArea, tag, wrap, removedLastNewLine);
-    };
-    gl.text.moveCursor = function(textArea, tag, wrapped, removedLastNewLine) {
+};
+gl.text.moveCursor = function(textArea, tag, wrapped, removedLastNewLine) {
   var pos;
   if (!textArea.setSelectionRange) {
     return;
@@ -151,8 +149,8 @@ require('vendor/latinise');
 
     return textArea.setSelectionRange(pos, pos);
   }
-    };
-    gl.text.updateText = function(textArea, tag, blockTag, wrap) {
+};
+gl.text.updateText = function(textArea, tag, blockTag, wrap) {
   var $textArea, selected, text;
   $textArea = $(textArea);
   textArea = $textArea.get(0);
@@ -160,8 +158,8 @@ require('vendor/latinise');
   selected = this.selectedText(text, textArea);
   $textArea.focus();
   return this.insertText(textArea, text, tag, blockTag, selected, wrap);
-    };
-    gl.text.init = function(form) {
+};
+gl.text.init = function(form) {
   var self;
   self = this;
   return $('.js-md', form).off('click').on('click', function() {
@@ -169,24 +167,22 @@ require('vendor/latinise');
     $this = $(this);
     return self.updateText($this.closest('.md-area').find('textarea'), $this.data('md-tag'), $this.data('md-block'), !$this.data('md-prepend'));
   });
-    };
-    gl.text.removeListeners = function(form) {
+};
+gl.text.removeListeners = function(form) {
   return $('.js-md', form).off();
-    };
-    gl.text.humanize = function(string) {
+};
+gl.text.humanize = function(string) {
   return string.charAt(0).toUpperCase() + string.replace(/_/g, ' ').slice(1);
-    };
-    gl.text.pluralize = function(str, count) {
+};
+gl.text.pluralize = function(str, count) {
   return str + (count > 1 || count === 0 ? 's' : '');
-    };
-    gl.text.truncate = function(string, maxLength) {
+};
+gl.text.truncate = function(string, maxLength) {
   return string.substr(0, (maxLength - 3)) + '...';
-    };
-    gl.text.dasherize = function(str) {
+};
+gl.text.dasherize = function(str) {
   return str.replace(/[_\s]+/g, '-');
-    };
-    gl.text.slugify = function(str) {
+};
+gl.text.slugify = function(str) {
   return str.trim().toLowerCase().latinise();
-    };
-  })(window);
-}).call(window);
+};

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

 /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, one-var, one-var-declaration-per-line, no-void, guard-for-in, no-restricted-syntax, prefer-template, quotes, max-len */
-(function() {
-  (function(w) {
-    var base;
-    if (w.gl == null) {
+var base;
+var w = window;
+if (w.gl == null) {
   w.gl = {};
-    }
-    if ((base = w.gl).utils == null) {
+}
+if ((base = w.gl).utils == null) {
   base.utils = {};
-    }
-    // Returns an array containing the value(s) of the
-    // of the key passed as an argument
-    w.gl.utils.getParameterValues = function(sParam) {
+}
+// Returns an array containing the value(s) of the
+// of the key passed as an argument
+w.gl.utils.getParameterValues = function(sParam) {
   var i, sPageURL, sParameterName, sURLVariables, values;
   sPageURL = decodeURIComponent(window.location.search.substring(1));
   sURLVariables = sPageURL.split('&');
@@ -25,10 +24,10 @@
     i += 1;
   }
   return values;
-    };
-    // @param {Object} params - url keys and value to merge
-    // @param {String} url
-    w.gl.utils.mergeUrlParams = function(params, url) {
+};
+// @param {Object} params - url keys and value to merge
+// @param {String} url
+w.gl.utils.mergeUrlParams = function(params, url) {
   var lastChar, newUrl, paramName, paramValue, pattern;
   newUrl = decodeURIComponent(url);
   for (paramName in params) {
@@ -48,9 +47,9 @@
     newUrl = newUrl.slice(0, -1);
   }
   return newUrl;
-    };
-    // removes parameter query string from url. returns the modified url
-    w.gl.utils.removeParamQueryString = function(url, param) {
+};
+// removes parameter query string from url. returns the modified url
+w.gl.utils.removeParamQueryString = function(url, param) {
   var urlVariables, variables;
   url = decodeURIComponent(url);
   urlVariables = url.split('&');
@@ -65,15 +64,15 @@
     }
     return results;
   })()).join('&');
-    };
-    w.gl.utils.removeParams = (params) => {
+};
+w.gl.utils.removeParams = (params) => {
   const url = new URL(window.location.href);
   params.forEach((param) => {
     url.search = w.gl.utils.removeParamQueryString(url.search, param);
   });
   return url.href;
-    };
-    w.gl.utils.getLocationHash = function(url) {
+};
+w.gl.utils.getLocationHash = function(url) {
   var hashIndex;
   if (typeof url === 'undefined') {
     // Note: We can't use window.location.hash here because it's
@@ -82,12 +81,10 @@
   }
   hashIndex = url.indexOf('#');
   return hashIndex === -1 ? null : url.substring(hashIndex + 1);
-    };
+};
 
-    w.gl.utils.refreshCurrentPage = () => gl.utils.visitUrl(document.location.href);
+w.gl.utils.refreshCurrentPage = () => gl.utils.visitUrl(document.location.href);
 
-    w.gl.utils.visitUrl = (url) => {
+w.gl.utils.visitUrl = (url) => {
   document.location.href = url;
-    };
-  })(window);
-}).call(window);
+};

app/assets/stylesheets/framework/calendar.scss

@@ -5,7 +5,7 @@
   direction: rtl;
 
   @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
-    overflow-x: scroll;
+    overflow-x: auto;
   }
 }
 

app/assets/stylesheets/framework/filters.scss

@@ -82,7 +82,7 @@
   .input-token:last-child {
     flex: 1;
     -webkit-flex: 1;
-    max-width: initial;
+    max-width: inherit;
   }
 }
 
@@ -246,17 +246,17 @@
   }
 }
 
-.filtered-search-history-dropdown-toggle-button {
+.filtered-search-history-dropdown-wrapper {
+  position: static;
   display: flex;
-  align-items: center;
+  flex-direction: column;
+}
+
+.filtered-search-history-dropdown-toggle-button {
+  flex: 1;
   width: auto;
-  height: 100%;
-  padding-top: 0;
-  padding-left: 0.75em;
-  padding-bottom: 0;
-  padding-right: 0.5em;
+  padding-right: 10px;
 
-  background-color: transparent;
   border-radius: 0;
   border-top: 0;
   border-left: 0;
@@ -264,6 +264,7 @@
   border-right: 1px solid $border-color;
 
   color: $gl-text-color-secondary;
+  line-height: 1;
 
   transition: color 0.1s linear;
 
@@ -275,24 +276,21 @@
   }
 
   .dropdown-toggle-text {
+    display: inline-block;
     color: inherit;
 
     .fa {
+      vertical-align: middle;
       color: inherit;
     }
   }
 
   .fa {
-    position: initial;
+    position: static;
   }
 
 }
 
-.filtered-search-history-dropdown-wrapper {
-  position: initial;
-  flex-shrink: 0;
-}
-
 .filtered-search-history-dropdown {
   width: 40%;
 

app/assets/stylesheets/framework/nav.scss

@@ -256,6 +256,33 @@
         display: block;
         margin: 0;
       }
+
+      &.inline {
+        display: flex;
+        flex-flow: row wrap;
+        justify-content: space-between;
+
+        > .btn,
+        > .btn-container,
+        > .dropdown,
+        > input,
+        > form {
+          flex: 1 1 auto;
+          margin: 0 0 10px;
+          margin-left: $gl-padding-top;
+          width: auto;
+
+          &:first-child {
+            margin-left: 0;
+            float: none;
+          }
+        }
+
+        .btn-full {
+          flex: 1 1 100%;
+          margin-left: 0;
+        }
+      }
     }
   }
 

app/assets/stylesheets/pages/builds.scss

@@ -39,7 +39,7 @@
     overflow-y: hidden;
     font-size: 12px;
 
-    .fa-refresh {
+    .fa-spinner {
       font-size: 24px;
       margin-left: 20px;
     }
@@ -219,7 +219,7 @@
   font-size: 12px;
   position: relative;
 
-  .fa-refresh {
+  .fa-spinner {
     font-size: 24px;
   }
 
@@ -366,7 +366,7 @@
         background-color: $row-hover;
       }
 
-      .fa-refresh {
+      .fa-spinner {
         font-size: 13px;
         margin-left: 3px;
       }

app/assets/stylesheets/pages/merge_requests.scss

@@ -523,7 +523,6 @@
   }
 
   .content-block {
-    border-top: 1px solid $border-color;
     padding: $gl-padding-top $gl-padding;
   }
 

app/assets/stylesheets/pages/notes.scss

@@ -18,12 +18,12 @@ ul.notes {
     float: left;
 
     svg {
-      width: 18px;
-      height: 18px;
+      width: 16px;
+      height: 16px;
       fill: $gray-darkest;
       position: absolute;
-      left: 30px;
-      top: 15px;
+      left: 0;
+      top: 16px;
     }
   }
 
@@ -144,6 +144,10 @@ ul.notes {
     padding: 0;
     clear: both;
 
+    @media (min-width: $screen-sm-min) {
+      margin-left: 65px;
+    }
+
     &.timeline-entry::after {
       clear: none;
     }
@@ -172,6 +176,10 @@ ul.notes {
 
     .timeline-content {
       padding: 14px 10px;
+
+      @media (min-width: $screen-sm-min) {
+        margin-left: 20px;
+      }
     }
 
     .note-header {

app/controllers/projects/hooks_controller.rb

@@ -49,7 +49,7 @@ class Projects::HooksController < Projects::ApplicationController
 
   def hook_params
     params.require(:hook).permit(
-      :build_events,
+      :job_events,
       :pipeline_events,
       :enable_ssl_verification,
       :issues_events,

app/controllers/projects_controller.rb

@@ -363,7 +363,11 @@ class ProjectsController < Projects::ApplicationController
   end
 
   def project_view_files?
-    current_user && current_user.project_view == 'files'
+    if current_user
+      current_user.project_view == 'files'
+    else
+      project_view_files_allowed?
+    end
   end
 
   # Override extract_ref from ExtractsPath, which returns the branch and file path
@@ -384,4 +388,8 @@ class ProjectsController < Projects::ApplicationController
     @id = get_id
     tree
   end
+
+  def project_view_files_allowed?
+    !project.empty_repo? && can?(current_user, :download_code, project)
+  end
 end

app/helpers/javascript_helper.rb

@@ -3,7 +3,8 @@ module JavascriptHelper
     javascript_include_tag asset_path(js)
   end
 
-  def page_specific_javascript_bundle_tag(js)
-    javascript_include_tag(*webpack_asset_paths(js))
+  # deprecated; use webpack_bundle_tag directly instead
+  def page_specific_javascript_bundle_tag(bundle)
+    webpack_bundle_tag(bundle)
   end
 end

app/helpers/preferences_helper.rb

@@ -63,6 +63,10 @@ module PreferencesHelper
   end
 
   def anonymous_project_view
-    @project.empty_repo? || !can?(current_user, :download_code, @project) ? 'activity' : 'readme'
+    if !@project.empty_repo? && can?(current_user, :download_code, @project)
+      'files'
+    else
+      'activity'
+    end
   end
 end

app/helpers/webpack_helper.rb

+require 'webpack/rails/manifest'
+
+module WebpackHelper
+  def webpack_bundle_tag(bundle)
+    javascript_include_tag(*gitlab_webpack_asset_paths(bundle))
+  end
+
+  # override webpack-rails gem helper until changes can make it upstream
+  def gitlab_webpack_asset_paths(source, extension: nil)
+    return "" unless source.present?
+
+    paths = Webpack::Rails::Manifest.asset_paths(source)
+    if extension
+      paths = paths.select { |p| p.ends_with? ".#{extension}" }
+    end
+
+    # include full webpack-dev-server url for rspec tests running locally
+    if Rails.env.test? && Rails.configuration.webpack.dev_server.enabled
+      host = Rails.configuration.webpack.dev_server.host
+      port = Rails.configuration.webpack.dev_server.port
+      protocol = Rails.configuration.webpack.dev_server.https ? 'https' : 'http'
+
+      paths.map! do |p|
+        "#{protocol}://#{host}:#{port}#{p}"
+      end
+    end
+
+    paths
+  end
+end

app/models/ci/trigger.rb

@@ -7,7 +7,7 @@ module Ci
     belongs_to :project
     belongs_to :owner, class_name: "User"
 
-    has_many :trigger_requests, dependent: :destroy
+    has_many :trigger_requests
     has_one :trigger_schedule, dependent: :destroy
 
     validates :token, presence: true, uniqueness: true

app/models/concerns/discussion_on_diff.rb

@@ -2,9 +2,9 @@
 module DiscussionOnDiff
   extend ActiveSupport::Concern
 
-  included do
   NUMBER_OF_TRUNCATED_DIFF_LINES = 16
 
+  included do
     delegate  :line_code,
               :original_line_code,
               :diff_file,

app/models/container_repository.rb

@@ -23,6 +23,10 @@ class ContainerRepository < ActiveRecord::Base
     @path ||= [project.full_path, name].select(&:present?).join('/')
   end
 
+  def location
+    File.join(registry.path, path)
+  end
+
   def tag(tag)
     ContainerRegistry::Tag.new(self, tag)
   end

app/models/issue.rb

@@ -34,8 +34,6 @@ class Issue < ActiveRecord::Base
 
   validates :project, presence: true
 
-  scope :cared, ->(user) { where(assignee_id: user) }
-  scope :open_for, ->(user) { opened.assigned_to(user) }
   scope :in_projects, ->(project_ids) { where(project_id: project_ids) }
 
   scope :without_due_date, -> { where(due_date: nil) }

app/models/label.rb

@@ -21,6 +21,8 @@ class Label < ActiveRecord::Base
   has_many :issues, through: :label_links, source: :target, source_type: 'Issue'
   has_many :merge_requests, through: :label_links, source: :target, source_type: 'MergeRequest'
 
+  before_validation :strip_whitespace_from_title_and_color
+
   validates :color, color: true, allow_blank: false
 
   # Don't allow ',' for label titles
@@ -193,4 +195,8 @@ class Label < ActiveRecord::Base
   def sanitize_title(value)
     CGI.unescapeHTML(Sanitize.clean(value.to_s))
   end
+
+  def strip_whitespace_from_title_and_color
+    %w(color title).each { |attr| self[attr] = self[attr]&.strip }
+  end
 end

app/models/merge_request.rb

@@ -110,7 +110,6 @@ class MergeRequest < ActiveRecord::Base
   scope :by_source_or_target_branch, ->(branch_name) do
     where("source_branch = :branch OR target_branch = :branch", branch: branch_name)
   end
-  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
   scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
   scope :of_projects, ->(ids) { where(target_project_id: ids) }
   scope :from_project, ->(project) { where(source_project_id: project.id) }

app/models/note.rb

@@ -98,6 +98,7 @@ class Note < ActiveRecord::Base
   before_validation :set_discussion_id, on: :create
   after_save :keep_around_commit, unless: :for_personal_snippet?
   after_save :expire_etag_cache
+  after_destroy :expire_etag_cache
 
   class << self
     def model_name

app/models/user.rb

@@ -613,10 +613,6 @@ class User < ActiveRecord::Base
     name.split.first unless name.blank?
   end
 
-  def cared_merge_requests
-    MergeRequest.cared(self)
-  end
-
   def projects_limit_left
     projects_limit - personal_projects.count
   end

app/policies/group_policy.rb

@@ -31,6 +31,7 @@ class GroupPolicy < BasePolicy
       can! :admin_namespace
       can! :admin_group_member
       can! :change_visibility_level
+      can! :create_subgroup if @user.can_create_group
     end
 
     if globally_viewable && @subject.request_access_enabled && !member

app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml

 .form-group
-  = form.label :shared_runners_minutes, 'Build minutes quota', class: 'control-label col-sm-2'
+  = form.label :shared_runners_minutes, 'Pipeline minutes quota', class: 'control-label col-sm-2'
   .col-sm-10
     = form.number_field :shared_runners_minutes, class: 'form-control'
     .help-block
-      Set the maximum number of build minutes that a group can use on shared Runners per month.
+      Set the maximum number of pipeline minutes that a group can use on shared Runners per month.
       0 for unlimited.
       = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'

app/views/admin/health_check/show.html.haml

@@ -13,7 +13,7 @@
     = button_to reset_health_check_token_admin_application_settings_path,
       method: :put, class: 'btn btn-default',
       data: { confirm: 'Are you sure you want to reset the health check token?' } do
-      = icon('refresh')
+      = icon('spinner')
       Reset health check access token
   %p.light
     Health information can be retrieved as plain text, JSON, or XML using:

app/views/admin/projects/_shared_runner_status.html.haml

@@ -6,8 +6,8 @@
         Enabled
         - if project.shared_runners_minutes_limit_enabled?
           - limit = project.actual_shared_runners_minutes_limit.to_i
-          (Limited to #{limit} build minutes per month)
+          (Limited to #{limit} pipeline minutes per month)
         - else
-          (Unlimited build minutes)
+          (Unlimited pipeline minutes)
       - else
         Disabled

app/views/admin/runners/index.html.haml

@@ -21,7 +21,7 @@
         = button_to reset_runners_token_admin_application_settings_path,
           method: :put, class: 'btn btn-default',
           data: { confirm: 'Are you sure you want to reset registration token?' } do
-          = icon('refresh')
+          = icon('spinner')
           Reset runners registration token
 
   .bs-callout

app/views/groups/_settings_head.html.haml

@@ -31,6 +31,6 @@
 
         - if @group.shared_runners_enabled? && @group.shared_runners_minutes_limit_enabled?
           = nav_link(path: 'pipeline_quota#index') do
-            = link_to group_audit_events_path(@group), title: 'Pipelines quota' do
+            = link_to group_pipeline_quota_path(@group), title: 'Pipelines quota' do
               %span
                 Pipelines quota

app/views/groups/pipeline_quota/index.html.haml

@@ -5,7 +5,7 @@
   Group pipelines quota
   = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'
 %p.light
-  Monthly build minutes usage across shared Runners for the
+  Monthly pipeline minutes usage across shared Runners for the
   %strong= @group.name
   group
 

app/views/groups/subgroups.html.haml

@@ -9,7 +9,7 @@
     .nav-controls
       = form_tag request.path, method: :get do |f|
         = search_field_tag :filter_groups, params[:filter_groups], placeholder: 'Filter by name', class: 'form-control', spellcheck: false
-      - if can? current_user, :admin_group, @group
+      - if can?(current_user, :create_subgroup, @group)
         = link_to new_group_path(parent_id: @group.id), class: 'btn btn-new pull-right' do
           New Subgroup
 

app/views/help/ui.html.haml

@@ -252,7 +252,7 @@
           = icon('chevron-down')
         .dropdown-menu.dropdown-select.dropdown-menu-selectable
           .dropdown-title
-            %span Dropdown Title
+            %span Dropdown title
             %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
               = icon('times')
           .dropdown-input
@@ -291,7 +291,7 @@
           = icon('chevron-down')
         .dropdown-menu.dropdown-select.dropdown-menu-selectable.is-loading
           .dropdown-title
-            %span Dropdown Title
+            %span Dropdown title
             %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
               = icon('times')
           .dropdown-input
@@ -335,7 +335,7 @@
           = icon('chevron-down')
         .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-user
           .dropdown-title
-            %span Dropdown Title
+            %span Dropdown title
             %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
               = icon('times')
           .dropdown-input
@@ -362,7 +362,7 @@
             .dropdown-title
               %button.dropdown-title-button.dropdown-menu-back{ aria: { label: "Go back" } }
                 = icon('arrow-left')
-              %span Dropdown Title
+              %span Dropdown title
               %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
                 = icon('times')
             .dropdown-input

app/views/layouts/_head.html.haml

@@ -28,9 +28,9 @@
   = stylesheet_link_tag "application", media: "all"
   = stylesheet_link_tag "print",       media: "print"
 
-  = javascript_include_tag(*webpack_asset_paths("runtime"))
-  = javascript_include_tag(*webpack_asset_paths("common"))
-  = javascript_include_tag(*webpack_asset_paths("main"))
+  = webpack_bundle_tag "runtime"
+  = webpack_bundle_tag "common"
+  = webpack_bundle_tag "main"
 
   - if content_for?(:page_specific_javascripts)
     = yield :page_specific_javascripts

app/views/layouts/nav/_explore.html.haml

 %ul
   = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
-    = link_to explore_root_path, title: 'Projects' do
+    = link_to explore_root_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
+      .shortcut-mappings
+        .key
+          = icon('arrow-up', 'aria-label' => 'hidden')
+          P
       %span
         Projects
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
-    = link_to explore_groups_path, title: 'Groups' do
+    = link_to explore_groups_path, title: 'Groups', class: 'dashboard-shortcuts-groups' do
+      .shortcut-mappings
+        .key
+          = icon('arrow-up', 'aria-label' => 'hidden')
+          G
       %span
         Groups
   = nav_link(controller: :snippets) do
-    = link_to explore_snippets_path, title: 'Snippets' do
+    = link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do
+      .shortcut-mappings
+        .key
+          = icon('arrow-up', 'aria-label' => 'hidden')
+          S
       %span
         Snippets
+  %li.divider
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       %span

app/views/layouts/nav/_project.html.haml

@@ -23,7 +23,7 @@
             Registry
 
     - if project_nav_tab? :issues
-      = nav_link(controller: [:issues, :labels, :milestones, :boards]) do
+      = nav_link(controller: @project.default_issues_tracker? ? [:issues, :labels, :milestones, :boards] : :issues) do
         = link_to namespace_project_issues_path(@project.namespace, @project), title: 'Issues', class: 'shortcuts-issues' do
           %span
             Issues
@@ -31,7 +31,7 @@
               %span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
 
     - if project_nav_tab? :merge_requests
-      = nav_link(controller: :merge_requests) do
+      = nav_link(controller: @project.default_issues_tracker? ? :merge_requests : [:merge_requests, :labels, :milestones]) do
         = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
           %span
             Merge Requests

app/views/namespaces/_shared_runner_status.html.haml

 - namespace = local_assigns.fetch(:namespace)
 - if namespace.shared_runners_enabled?
   %li
-    %span.light Build minutes quota:
+    %span.light Pipeline minutes quota:
     %strong
       = group_shared_runner_limits_quota(namespace)
       = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'

app/views/namespaces/_shared_runners_minutes_setting.html.haml

 - if current_user.admin?
   .form-group
     = f.label :shared_runners_minutes_limit, class: 'control-label' do
-      Build Minutes Quota
+      Pipeline Minutes Quota
     .col-sm-10
       = f.number_field :shared_runners_minutes_limit, class: 'form-control', min: 0
       %span.help-block#shared_runners_minutes_limit_help_block
-        Set the maximum number of build minutes that a group can use on shared Runners per month.
+        Set the maximum number of pipeline minutes that a group can use on shared Runners per month.
         Set 0 for unlimited.
         Set empty to inherit the global setting of #{current_application_settings.shared_runners_minutes}.
         = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'

app/views/projects/builds/_shared_runner_limit_warning.html.haml

@@ -3,7 +3,7 @@
   - quota_limit = project.namespace.actual_shared_runners_minutes_limit
   .bs-callout.bs-callout-warning
     %p
-      You have used all your shared Runners build minutes.
+      You have used all your shared Runners pipeline minutes.
       = "(#{quota_used} of #{quota_limit})."
       - if can?(current_user, :admin_build, @project)
         %br

app/views/projects/builds/_sidebar.html.haml

@@ -136,7 +136,7 @@
               - else
                 = build.id
             - if build.retried?
-              %i.fa.fa-refresh.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
+              %i.fa.fa-spinner.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
 
 :javascript
   new Sidebar();

app/views/projects/ci/builds/_build.html.haml

@@ -36,7 +36,7 @@
       = icon('warning', class: 'text-warning has-tooltip', title: 'Job is stuck. Check runners.')
 
     - if retried
-      = icon('refresh', class: 'text-warning has-tooltip', title: 'Job was retried')
+      = icon('spinner', class: 'text-warning has-tooltip', title: 'Job was retried')
 
     .label-container
       - if job.tags.any?

app/views/projects/issues/index.html.haml

@@ -19,7 +19,7 @@
   %div{ class: (container_class) }
     .top-area
       = render 'shared/issuable/nav', type: :issues
-      .nav-controls
+      .nav-controls.inline
         = link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
           = icon('rss')
         - if current_user
@@ -29,7 +29,7 @@
                                                    @project,
                                                    issue: { assignee_id: issues_finder.assignee.try(:id),
                                                             milestone_id: issues_finder.milestones.first.try(:id) }),
-                                                   class: "btn btn-new",
+                                                   class: "btn btn-new btn-full",
                                                    title: "New issue",
                                                    id: "new_issue_link" do
           New issue

app/views/projects/labels/edit.html.haml

 - @no_container = true
 - page_title "Edit", @label.name, "Labels"
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 %div{ class: container_class }
   %h3.page-title

app/views/projects/labels/index.html.haml

 - @no_container = true
 - page_title "Labels"
 - hide_class = ''
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 - if @labels.exists? || @prioritized_labels.exists?
   %div{ class: container_class }

app/views/projects/labels/new.html.haml

 - @no_container = true
 - page_title "New Label"
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 %div{ class: container_class }
   %h3.page-title

app/views/projects/merge_requests/_head.html.haml

+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
+    = render 'shared/nav_scroll'
+    .nav-links.sub-nav.scrolling-tabs
+      %ul{ class: (container_class) }
+        = nav_link(controller: :merge_requests) do
+          = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
+            %span
+              List
+
+        - if project_nav_tab? :labels
+          = nav_link(controller: :labels) do
+            = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+              %span
+                Labels
+
+        - if project_nav_tab? :milestones
+          = nav_link(controller: :milestones) do
+            = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+              %span
+                Milestones

app/views/projects/merge_requests/index.html.haml

@@ -2,6 +2,9 @@
 - @bulk_edit = can?(current_user, :admin_merge_request, @project)
 
 - page_title "Merge Requests"
+- unless @project.default_issues_tracker?
+  = content_for :sub_nav do
+    = render "projects/merge_requests/head"
 = render 'projects/last_push'
 
 - content_for :page_specific_javascripts do

app/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -18,7 +18,7 @@
                   Select merge moment
               %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
                 %li
-                  = link_to "#", class: "merge_when_pipeline_succeeds" do
+                  = link_to "#", class: "merge-when-pipeline-succeeds" do
                     = icon('check fw')
                     Merge when pipeline succeeds
                 %li

app/views/projects/milestones/edit.html.haml

 - @no_container = true
 - page_title "Edit", @milestone.title, "Milestones"
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 %div{ class: container_class }
 

app/views/projects/milestones/index.html.haml

 - @no_container = true
 - page_title 'Milestones'
-= render 'projects/issues/head'
+= render "shared/mr_head"
 
 %div{ class: container_class }
   .top-area

app/views/projects/milestones/new.html.haml

 - @no_container = true
 - page_title "New Milestone"
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 %div{ class: container_class }
   %h3.page-title

app/views/projects/milestones/show.html.haml

 - @no_container = true
 - page_title       @milestone.title, "Milestones"
 - page_description @milestone.description
-= render "projects/issues/head"
+= render "shared/mr_head"
 
 %div{ class: container_class }
   .detail-page-header.milestone-page-header

app/views/projects/registry/repositories/_image.html.haml

@@ -4,7 +4,7 @@
       = icon('chevron-down', 'aria-hidden': 'true')
       = escape_once(image.path)
 
-    = clipboard_button(clipboard_text: "docker pull #{image.path}")
+    = clipboard_button(clipboard_text: "docker pull #{image.location}")
 
     .controls.hidden-xs.pull-right
       = link_to namespace_project_container_registry_path(@project.namespace, @project, image),

app/views/projects/registry/repositories/_tag.html.haml

 %tr.tag
   %td
     = escape_once(tag.name)
-    = clipboard_button(text: "docker pull #{tag.path}")
+    = clipboard_button(text: "docker pull #{tag.location}")
   %td
     - if tag.revision
       %span.has-tooltip{ title: "#{tag.revision}" }

app/views/shared/_mr_head.html.haml

+- if @project.default_issues_tracker?
+  = render "projects/issues/head"
+- else
+  = render "projects/merge_requests/head"

app/views/shared/_shared_runners_minutes_limit.html.haml

@@ -6,7 +6,7 @@
 - if cookies[:hide_shared_runner_quota_message].blank? && has_limit && namespace.shared_runners_minutes_used? && can_see_status
   .shared-runner-quota-message.alert.alert-warning.hidden-xs{ data: { scope: scope } }
     = namespace.name
-    has exceeded their build minutes quota. Pipelines will not run anymore on shared Runners.
+    has exceeded their pipeline minutes quota. Pipelines will not run anymore on shared Runners.
 
     .pull-right
       = link_to 'Remind later', '#', class: 'hide-shared-runner-limit-message alert-link'

app/workers/build_coverage_worker.rb

@@ -3,7 +3,6 @@ class BuildCoverageWorker
   include BuildQueue
 
   def perform(build_id)
-    Ci::Build.find_by(id: build_id)
-      .try(:update_coverage)
+    Ci::Build.find_by(id: build_id)&.update_coverage
   end
 end

changelogs/unreleased-ee/1878-export-csv-button-should-be-inline-with-rss-button-on-mobile.yml

+---
+title: Inline RSS button with Export Issues button for mobile
+merge_request: 1637
+author:

changelogs/unreleased-ee/2158-pipeline-quota-link.yml

+---
+title: Fixes broken link to pipeline quota
+merge_request:
+author:

changelogs/unreleased/2120-issues-search-bar-not-picking-up.yml

+---
+title: Fix filtered search input width for IE
+merge_request:
+author:

changelogs/unreleased/22714-update-all-instances-of-fa-refresh.yml

+---
+title: Update all instances of the old loading icon
+merge_request: 10490
+author: Andrew Torres

changelogs/unreleased/27729-improve-webpack-dev-environment.yml

+---
+title: Add webpack_bundle_tag helper to improve non-localhost GDK configurations
+merge_request: 10604
+author:

changelogs/unreleased/28017-separate-ce-params-on-api.yml

+---
+title: Separate CE params on Grape API
+merge_request:
+author:

changelogs/unreleased/29056-backport-ee-cleanup-database-file.yml

+---
+title: Turns true value and false value database methods from instance to class methods
+merge_request: 10583
+author:

changelogs/unreleased/30457-expire-note-destroy.yml

+---
+title: Fix issue's note cache expiration after delete
+merge_request:
+author: mhasbini

changelogs/unreleased/30779-show-mr-subnav-issue-tracker.yml

+---
+title: Show sub-nav under Merge Requests when issue tracker is non-default.
+merge_request: 10658
+author:

changelogs/unreleased/bb_save_trace.yml

+---
+title: "[BB Importer] Save the error trace and the whole raw document to debug problems
+  easier"
+merge_request:
+author:

changelogs/unreleased/boards-done-add-tooltip.yml

+---
+title: Add tooltip to header of Done board
+merge_request: 10574
+author: Andy Brown

changelogs/unreleased/dz-fix-project-view.yml

+---
+title: Change project view default for existing users and anonymous visitors to files+readme
+merge_request: 10498
+author:

changelogs/unreleased/fix-missing-capitalisation-buttons.yml

+---
+title: Fix missing capitalisation on views
+merge_request:
+author:

changelogs/unreleased/fix-preloading-merge_request_diff.yml

+---
+title: Fix bad query for PostgreSQL showing merge requests list
+merge_request: 10666
+author: