Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-17

Signed-off-by: Rémy Coutable <remy@rymai.me>

.eslintrc

@@ -27,6 +27,7 @@
   },
   "rules": {
     "filenames/match-regex": [2, "^[a-z0-9_]+$"],
+    "import/no-commonjs": "error",
     "no-multiple-empty-lines": ["error", { "max": 1 }],
     "promise/catch-or-return": "error"
   }

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 9.2.0 (2017-05-22)
+
+- Stop using sidekiq cron for push mirrors. !1616
+- Inline RSS button with Export Issues button for mobile. !1637
+- Highlight Contribution Analytics tab under groups when active, remove sub-nav items. !1677
+- Uses etag polling for deployboards. !1713
+- Support more elasticsearch versions. !1716
+- Support advanced search queries using elasticsearch. !1770
+- Remove superfluous wording on push rules. !1811
+- Geo - Fix signing out from secondary node when "Remember me" option is checked. !1903
+- Add global wiki search using Elasticsearch.
+- Remove warning about protecting Service Desk email from form.
+- Geo: Resync repositories that have been updated recently.
+- Respect project features when searching alternative branches with elasticsearch enabled.
+- Backfill projects where the last attempt to backfill failed.
+- Fix MR approvals sentence when all approvers need to approve the MR.
+- Fix for XSS in project mirror errors caused by Hamlit filter usage.
+- Feature availability check using feature list AND license addons.
+- Disable mirror workers for Geo secondaries.
+
 ## 9.1.4 (2017-05-12)
 
 - Remove warning about protecting Service Desk email from form.

app/assets/javascripts/boards/boards_bundle.js

@@ -6,27 +6,27 @@ import Vue from 'vue';
 import VueResource from 'vue-resource';
 import FilteredSearchBoards from './filtered_search_boards';
 import eventHub from './eventhub';
+import './models/issue';
+import './models/label';
+import './models/list';
+import './models/milestone';
+import './models/assignee';
+import './stores/boards_store';
+import './stores/modal_store';
+import './services/board_service';
+import './mixins/modal_mixins';
+import './mixins/sortable_default_options';
+import './filters/due_date_filters';
+import './components/board';
+import './components/board_sidebar';
+import './components/new_list_dropdown';
+import './components/modal/index';
+import '../vue_shared/vue_resource_interceptor';
+
+import './components/boards_selector';
 import collapseIcon from './icons/fullscreen_collapse.svg';
 import expandIcon from './icons/fullscreen_expand.svg';
 
-require('./models/issue');
-require('./models/label');
-require('./models/list');
-require('./models/milestone');
-require('./models/assignee');
-require('./stores/boards_store');
-require('./stores/modal_store');
-require('./services/board_service');
-require('./mixins/modal_mixins');
-require('./mixins/sortable_default_options');
-require('./filters/due_date_filters');
-require('./components/board');
-require('./components/boards_selector');
-require('./components/board_sidebar');
-require('./components/new_list_dropdown');
-require('./components/modal/index');
-require('../vue_shared/vue_resource_interceptor');
-
 Vue.use(VueResource);
 
 $(() => {

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

@@ -3,9 +3,7 @@
 import Vue from 'vue';
 import boardList from './board_list';
 import boardBlankState from './board_blank_state';
-
-require('./board_delete');
-require('./board_list');
+import './board_delete';
 
 const Store = gl.issueBoards.BoardsStore;
 

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

-require('./issue_card_inner');
+import './issue_card_inner';
 
 const Store = gl.issueBoards.BoardsStore;
 

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

 /* global BoardService */
 
 import Vue from 'vue';
-
-const boardMilestoneSelect = require('./milestone_select');
-const extraMilestones = require('../mixins/extra_milestones');
+import boardMilestoneSelect from './milestone_select';
+import extraMilestones from '../mixins/extra_milestones';
 
 (() => {
   window.gl = window.gl || {};

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

@@ -7,11 +7,9 @@
 
 import Vue from 'vue';
 import eventHub from '../../sidebar/event_hub';
-
 import AssigneeTitle from '../../sidebar/components/assignees/assignee_title';
 import Assignees from '../../sidebar/components/assignees/assignees';
-
-require('./sidebar/remove_issue');
+import './sidebar/remove_issue';
 
 const Store = gl.issueBoards.BoardsStore;
 

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

 import Vue from 'vue';
-
-require('./board_new_form');
+import './board_new_form';
 
 (() => {
   window.gl = window.gl || {};

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

 /* global BoardService */
 
-const extraMilestones = require('../mixins/extra_milestones');
+import extraMilestones from '../mixins/extra_milestones';
 
-module.exports = {
+export default {
   props: {
     board: {
       type: Object,

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

@@ -2,8 +2,7 @@
 /* global Flash */
 
 import Vue from 'vue';
-
-require('./lists_dropdown');
+import './lists_dropdown';
 
 const ModalStore = gl.issueBoards.ModalStore;
 

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

 import Vue from 'vue';
 import modalFilters from './filters';
-
-require('./tabs');
+import './tabs';
 
 const ModalStore = gl.issueBoards.ModalStore;
 

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

@@ -2,12 +2,19 @@
 
 import Vue from 'vue';
 import queryData from '../../utils/query_data';
+<<<<<<< HEAD
 import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
 
 require('./header');
 require('./list');
 require('./footer');
 require('./empty_state');
+=======
+import './header';
+import './list';
+import './footer';
+import './empty_state';
+>>>>>>> origin/master
 
 const ModalStore = gl.issueBoards.ModalStore;
 

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

-module.exports = [
+export default [
   {
     id: null,
     title: 'Any Milestone',

app/assets/javascripts/copy_as_gfm.js

 /* eslint-disable class-methods-use-this, object-shorthand, no-unused-vars, no-use-before-define, no-new, max-len, no-restricted-syntax, guard-for-in, no-continue */
 
-require('./lib/utils/common_utils');
+import './lib/utils/common_utils';
 
 const gfmRules = {
   // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb convert

app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js

@@ -4,18 +4,16 @@ import Vue from 'vue';
 import Cookies from 'js-cookie';
 import Translate from '../vue_shared/translate';
 import LimitWarningComponent from './components/limit_warning_component';
-
-require('./components/stage_code_component');
-require('./components/stage_issue_component');
-require('./components/stage_plan_component');
-require('./components/stage_production_component');
-require('./components/stage_review_component');
-require('./components/stage_staging_component');
-require('./components/stage_test_component');
-require('./components/total_time_component');
-require('./cycle_analytics_service');
-require('./cycle_analytics_store');
-require('./default_event_objects');
+import './components/stage_code_component';
+import './components/stage_issue_component';
+import './components/stage_plan_component';
+import './components/stage_production_component';
+import './components/stage_review_component';
+import './components/stage_staging_component';
+import './components/stage_test_component';
+import './components/total_time_component';
+import './cycle_analytics_service';
+import './cycle_analytics_store';
 
 Vue.use(Translate);
 

app/assets/javascripts/cycle_analytics/cycle_analytics_store.js

 /* eslint-disable no-param-reassign */
-import { __ } from '../locale';
 
-require('../lib/utils/text_utility');
-const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
+import { __ } from '../locale';
+import '../lib/utils/text_utility';
+import DEFAULT_EVENT_OBJECTS from './default_event_objects';
 
 const global = window.gl || (window.gl = {});
 global.cycleAnalytics = global.cycleAnalytics || {};

app/assets/javascripts/cycle_analytics/default_event_objects.js

-module.exports = {
+export default {
   issue: {
     created_at: '',
     url: '',

app/assets/javascripts/diff.js

 /* eslint-disable class-methods-use-this */
 
-require('./lib/utils/url_utility');
+import './lib/utils/url_utility';
 
 const UNFOLD_COUNT = 20;
 let isBound = false;

app/assets/javascripts/diff_notes/diff_notes_bundle.js

@@ -3,19 +3,18 @@
 /* global ResolveServiceClass */
 
 import Vue from 'vue';
-
-require('./models/discussion');
-require('./models/note');
-require('./stores/comments');
-require('./services/resolve');
-require('./mixins/discussion');
-require('./components/comment_resolve_btn');
-require('./components/jump_to_discussion');
-require('./components/resolve_btn');
-require('./components/resolve_count');
-require('./components/resolve_discussion_btn');
-require('./components/diff_note_avatars');
-require('./components/new_issue_for_discussion');
+import './models/discussion';
+import './models/note';
+import './stores/comments';
+import './services/resolve';
+import './mixins/discussion';
+import './components/comment_resolve_btn';
+import './components/jump_to_discussion';
+import './components/resolve_btn';
+import './components/resolve_count';
+import './components/resolve_discussion_btn';
+import './components/diff_note_avatars';
+import './components/new_issue_for_discussion';
 
 $(() => {
   const projectPath = document.querySelector('.merge-request').dataset.projectPath;

app/assets/javascripts/diff_notes/services/resolve.js

@@ -3,11 +3,7 @@
 /* global CommentsStore */
 
 import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-require('../../vue_shared/vue_resource_interceptor');
-
-Vue.use(VueResource);
+import '../../vue_shared/vue_resource_interceptor';
 
 window.gl = window.gl || {};
 

app/assets/javascripts/dispatcher.js

@@ -36,14 +36,12 @@
 /* global ShortcutsWiki */
 
 import Issue from './issue';
-
 import BindInOut from './behaviors/bind_in_out';
 import DeleteModal from './branches/branches_delete_modal';
 import Group from './group';
 import GroupName from './group_name';
 import GroupsList from './groups_list';
 import ProjectsList from './projects_list';
-import ApproversSelect from './approvers_select';
 import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
 import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
 import Landing from './landing';
@@ -59,8 +57,10 @@ import AutoWidthDropdownSelect from './issuable/auto_width_dropdown_select';
 import UsersSelect from './users_select';
 import RefSelectDropdown from './ref_select_dropdown';
 import GfmAutoComplete from './gfm_auto_complete';
+import ShortcutsBlob from './shortcuts_blob';
 
-const ShortcutsBlob = require('./shortcuts_blob');
+// EE-only
+import ApproversSelect from './approvers_select';
 
 (function() {
   var Dispatcher;

app/assets/javascripts/dropzone_input.js

 /* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, one-var, no-var, one-var-declaration-per-line, no-unused-vars, camelcase, quotes, no-useless-concat, prefer-template, quote-props, comma-dangle, object-shorthand, consistent-return, prefer-arrow-callback */
 /* global Dropzone */
 
-require('./preview_markdown');
+import './preview_markdown';
 
 window.DropzoneInput = (function() {
   function DropzoneInput(form) {

app/assets/javascripts/filtered_search/dropdown_hint.js

 import Filter from '~/droplab/plugins/filter';
-
-require('./filtered_search_dropdown');
+import './filtered_search_dropdown';
 
 class DropdownHint extends gl.FilteredSearchDropdown {
   constructor(droplab, dropdown, input, filter) {

app/assets/javascripts/filtered_search/dropdown_non_user.js

@@ -2,8 +2,7 @@
 
 import Ajax from '~/droplab/plugins/ajax';
 import Filter from '~/droplab/plugins/filter';
-
-require('./filtered_search_dropdown');
+import './filtered_search_dropdown';
 
 class DropdownNonUser extends gl.FilteredSearchDropdown {
   constructor(droplab, dropdown, input, filter, endpoint, symbol) {

app/assets/javascripts/filtered_search/dropdown_user.js

 /* global Flash */
 
 import AjaxFilter from '~/droplab/plugins/ajax_filter';
-
-require('./filtered_search_dropdown');
+import './filtered_search_dropdown';
 
 class DropdownUser extends gl.FilteredSearchDropdown {
   constructor(droplab, dropdown, input, filter) {

app/assets/javascripts/filtered_search/filtered_search_bundle.js

-require('./dropdown_hint');
-require('./dropdown_non_user');
-require('./dropdown_user');
-require('./dropdown_utils');
-require('./filtered_search_dropdown_manager');
-require('./filtered_search_dropdown');
-require('./filtered_search_manager');
-require('./filtered_search_token_keys');
-require('./filtered_search_tokenizer');
-require('./filtered_search_visual_tokens');
+import './dropdown_hint';
+import './dropdown_non_user';
+import './dropdown_user';
+import './dropdown_utils';
+import './filtered_search_dropdown_manager';
+import './filtered_search_dropdown';
+import './filtered_search_manager';
+import './filtered_search_token_keys';
+import './filtered_search_tokenizer';
+import './filtered_search_visual_tokens';
 
-require('./filtered_search_token_keys_with_weights');
+// EE-only
+import './filtered_search_token_keys_with_weights';

app/assets/javascripts/filtered_search/filtered_search_token_keys_with_weights.js

-require('./filtered_search_token_keys');
+import './filtered_search_token_keys';
 
 const weightTokenKey = {
   key: 'weight',

app/assets/javascripts/filtered_search/filtered_search_tokenizer.js

-require('./filtered_search_token_keys');
+import './filtered_search_token_keys';
 
 class FilteredSearchTokenizer {
   static processTokens(input) {

app/assets/javascripts/gl_field_errors.js

 /* eslint-disable comma-dangle, class-methods-use-this, max-len, space-before-function-paren, arrow-parens, no-param-reassign */
 
-require('./gl_field_error');
+import './gl_field_error';
 
 const customValidationFlag = 'gl-field-error-ignore';
 

app/assets/javascripts/issue.js

 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, one-var, no-underscore-dangle, one-var-declaration-per-line, object-shorthand, no-unused-vars, no-new, comma-dangle, consistent-return, quotes, dot-notation, quote-props, prefer-arrow-callback, max-len */
- /* global Flash */
-import CreateMergeRequestDropdown from './create_merge_request_dropdown';
+/* global Flash */
 
-require('./flash');
-require('~/lib/utils/text_utility');
-require('vendor/jquery.waitforimages');
-require('./task_list');
+import 'vendor/jquery.waitforimages';
+import '~/lib/utils/text_utility';
+import './flash';
+import './task_list';
+import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 
 class Issue {
   constructor() {

app/assets/javascripts/issues/issues_bundle.js

-require('./export_csv_modal');
+import './export_csv_modal';

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

 /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, comma-dangle, no-unused-expressions, prefer-template, max-len */
-/* global timeago */
-/* global dateFormat */
 
-window.timeago = require('timeago.js');
-window.dateFormat = require('vendor/date.format');
+import timeago from 'timeago.js';
+import dateFormat from 'vendor/date.format';
+
+window.timeago = timeago;
+window.dateFormat = dateFormat;
 
 (function() {
   (function(w) {
@@ -101,8 +102,7 @@ window.dateFormat = require('vendor/date.format');
     };
 
     w.gl.utils.updateTimeagoText = function(el) {
-      const timeago = gl.utils.getTimeago();
-      const formattedDate = timeago.format(el.getAttribute('datetime'), 'gl_en');
+      const formattedDate = gl.utils.getTimeago().format(el.getAttribute('datetime'), 'gl_en');
 
       if (el.textContent !== formattedDate) {
         el.textContent = formattedDate;

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

@@ -2,9 +2,7 @@
  * exports HTTP status codes
  */
 
-const statusCodes = {
+export default {
   NO_CONTENT: 204,
   OK: 200,
 };
-
-module.exports = statusCodes;

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, vars-on-top */
-require('vendor/latinise');
+
+import 'vendor/latinise';
 
 var base;
 var w = window;

app/assets/javascripts/line_highlighter.js

@@ -4,8 +4,6 @@
 //
 // Handles single- and multi-line selection and highlight for blob views.
 //
-require('vendor/jquery.scrollTo');
-
 //
 // ### Example Markup
 //

app/assets/javascripts/main.js

@@ -178,7 +178,7 @@ import './ldap_groups_select';
 import './path_locks';
 import './weight_select';
 
-// eslint-disable-next-line global-require
+// eslint-disable-next-line global-require, import/no-commonjs
 if (process.env.NODE_ENV !== 'production') require('./test_utils/');
 
 document.addEventListener('beforeunload', function () {

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js

@@ -2,14 +2,13 @@
 /* global Flash */
 
 import Vue from 'vue';
-
-require('./merge_conflict_store');
-require('./merge_conflict_service');
-require('./mixins/line_conflict_utils');
-require('./mixins/line_conflict_actions');
-require('./components/diff_file_editor');
-require('./components/inline_conflict_lines');
-require('./components/parallel_conflict_lines');
+import './merge_conflict_store';
+import './merge_conflict_service';
+import './mixins/line_conflict_utils';
+import './mixins/line_conflict_actions';
+import './components/diff_file_editor';
+import './components/inline_conflict_lines';
+import './components/parallel_conflict_lines';
 
 $(() => {
   const INTERACTIVE_RESOLVE_MODE = 'interactive';

app/assets/javascripts/merge_request.js

 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */
 /* global MergeRequestTabs */
 
-require('vendor/jquery.waitforimages');
-require('./task_list');
-require('./merge_request_tabs');
+import 'vendor/jquery.waitforimages';
+import './task_list';
+import './merge_request_tabs';
 
 (function() {
   this.MergeRequest = (function() {

app/assets/javascripts/notes.js

@@ -6,15 +6,17 @@
 
 import $ from 'jquery';
 import Cookies from 'js-cookie';
+import autosize from 'vendor/autosize';
+import Dropzone from 'dropzone';
+import 'vendor/jquery.caret'; // required by jquery.atwho
+import 'vendor/jquery.atwho';
 import CommentTypeToggle from './comment_type_toggle';
+import './autosave';
+import './dropzone_input';
+import './task_list';
 
-require('./autosave');
-window.autosize = require('vendor/autosize');
-window.Dropzone = require('dropzone');
-require('./dropzone_input');
-require('vendor/jquery.caret'); // required by jquery.atwho
-require('vendor/jquery.atwho');
-require('./task_list');
+window.autosize = autosize;
+window.Dropzone = Dropzone;
 
 const normalizeNewlines = function(str) {
   return str.replace(/\r\n/g, '\n');

app/assets/javascripts/pager.js

-require('~/lib/utils/common_utils');
-require('~/lib/utils/url_utility');
+import '~/lib/utils/common_utils';
+import '~/lib/utils/url_utility';
 
 (() => {
   const ENDLESS_SCROLL_BOTTOM_PX = 400;

app/assets/javascripts/profile/profile_bundle.js

-require('./gl_crop');
-require('./profile');
+import './gl_crop';
+import './profile';

app/assets/javascripts/protected_branches/protected_branches_bundle.js

-require('./protected_branch_access_dropdown');
-require('./protected_branch_create');
-require('./protected_branch_dropdown');
-require('./protected_branch_edit');
-require('./protected_branch_edit_list');
+import './protected_branch_access_dropdown';
+import './protected_branch_create';
+import './protected_branch_dropdown';
+import './protected_branch_edit';
+import './protected_branch_edit_list';

app/assets/javascripts/shortcuts_blob.js

 /* global Mousetrap */
 /* global Shortcuts */
 
-require('./shortcuts');
+import './shortcuts';
 
 const defaults = {
   skipResetBindings: false,
   fileBlobPermalinkUrl: null,
 };
 
-class ShortcutsBlob extends Shortcuts {
+export default class ShortcutsBlob extends Shortcuts {
   constructor(opts) {
     const options = Object.assign({}, defaults, opts);
     super(options.skipResetBindings);
@@ -25,5 +25,3 @@ class ShortcutsBlob extends Shortcuts {
     }
   }
 }
-
-module.exports = ShortcutsBlob;

app/assets/javascripts/shortcuts_find_file.js

@@ -2,7 +2,7 @@
 /* global Mousetrap */
 /* global ShortcutsNavigation */
 
-require('./shortcuts_navigation');
+import './shortcuts_navigation';
 
 (function() {
   var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },

app/assets/javascripts/shortcuts_issuable.js

@@ -3,8 +3,8 @@
 /* global ShortcutsNavigation */
 /* global sidebar */
 
-require('mousetrap');
-require('./shortcuts_navigation');
+import 'mousetrap';
+import './shortcuts_navigation';
 
 (function() {
   var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },

app/assets/javascripts/shortcuts_navigation.js

 /* eslint-disable func-names, space-before-function-paren, max-len, no-var, one-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-arrow-callback, consistent-return, no-return-assign */
 /* global Mousetrap */
 /* global Shortcuts */
-import findAndFollowLink from './shortcuts_dashboard_navigation';
 
-require('./shortcuts');
+import findAndFollowLink from './shortcuts_dashboard_navigation';
+import './shortcuts';
 
 (function() {
   var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },

app/assets/javascripts/shortcuts_network.js

@@ -2,7 +2,7 @@
 /* global Mousetrap */
 /* global ShortcutsNavigation */
 
-require('./shortcuts_navigation');
+import './shortcuts_navigation';
 
 (function() {
   var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },

app/assets/javascripts/task_list.js

 /* global Flash */
-require('vendor/task_list');
+
+import 'vendor/task_list';
 
 class TaskList {
   constructor(options = {}) {

app/assets/javascripts/terminal/terminal_bundle.js

-require('vendor/xterm/encoding-indexes.js');
-require('vendor/xterm/encoding.js');
-window.Terminal = require('vendor/xterm/xterm.js');
-require('vendor/xterm/fit.js');
-require('./terminal.js');
+import 'vendor/xterm/encoding-indexes';
+import 'vendor/xterm/encoding';
+import Terminal from 'vendor/xterm/xterm';
+import 'vendor/xterm/fit';
+import './terminal';
+
+window.Terminal = Terminal;
 
 $(() => new gl.Terminal({ selector: '#terminal' }));

app/assets/javascripts/users/users_bundle.js

-require('./calendar');
+import './calendar';

app/assets/javascripts/version_check_image.js

-class VersionCheckImage {
+export default class VersionCheckImage {
   static bindErrorEvent(imageElement) {
     imageElement.off('error').on('error', () => imageElement.hide());
   }
@@ -6,5 +6,3 @@ class VersionCheckImage {
 
 window.gl = window.gl || {};
 gl.VersionCheckImage = VersionCheckImage;
-
-module.exports = VersionCheckImage;

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js

-require('../../lib/utils/text_utility');
+import '../../lib/utils/text_utility';
 
 export default {
   name: 'MRWidgetHeader',

app/assets/javascripts/wikis.js

 /* eslint-disable no-param-reassign */
 /* global Breakpoints */
 
-require('./breakpoints');
-require('vendor/jquery.nicescroll');
+import 'vendor/jquery.nicescroll';
+import './breakpoints';
 
 ((global) => {
   class Wikis {

app/assets/javascripts/zen_mode.js

 /* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, no-unused-vars, consistent-return, camelcase, comma-dangle, max-len */
-/* global Dropzone */
 /* global Mousetrap */
 
 // Zen Mode (full screen) textarea
@@ -7,10 +6,12 @@
 /*= provides zen_mode:enter */
 /*= provides zen_mode:leave */
 
-require('vendor/jquery.scrollTo');
-window.Dropzone = require('dropzone');
-require('mousetrap');
-require('mousetrap/plugins/pause/mousetrap-pause');
+import 'vendor/jquery.scrollTo';
+import Dropzone from 'dropzone';
+import 'mousetrap';
+import 'mousetrap/plugins/pause/mousetrap-pause';
+
+window.Dropzone = Dropzone;
 
 //
 // ### Events

app/models/concerns/elastic/application_search.rb

@@ -147,7 +147,7 @@ module Elastic
         query_hash
       end
 
-      def iid_query_hash(query_hash, iid)
+      def iid_query_hash(iid)
         {
           query: {
             bool: {

app/models/concerns/elastic/issues_search.rb

@@ -49,7 +49,7 @@ module Elastic
       def self.elastic_search(query, options: {})
         query_hash =
           if query =~ /#(\d+)\z/
-            iid_query_hash(query_hash, $1)
+            iid_query_hash($1)
           else
             basic_query_hash(%w(title^2 description), query)
           end

app/models/concerns/elastic/merge_requests_search.rb

@@ -61,8 +61,8 @@ module Elastic
 
       def self.elastic_search(query, options: {})
         query_hash =
-          if query =~ /#(\d+)\z/
-            iid_query_hash(query_hash, $1)
+          if query =~ /\!(\d+)\z/
+            iid_query_hash($1)
           else
             basic_query_hash(%w(title^2 description), query)
           end

app/views/search/_form.html.haml

@@ -15,5 +15,5 @@
     = button_tag "Search", class: "btn btn-success btn-search"
   - if current_application_settings.elasticsearch_search?
     .help-block
-      = link_to 'Advanced search functionality', help_page_path('user/search/advanced-search-syntax.md'), target: '_blank'
+      = link_to 'Advanced search functionality', help_page_path('user/search/advanced_search_syntax.md'), target: '_blank'
       is enabled.

changelogs/unreleased-ee/1052-advanced-search-syntax.yml

----
-title: Support advanced search queries using elasticsearch
-merge_request: 1770
-author:

changelogs/unreleased-ee/1565-global-wiki-search.yml

----
-title: Add global wiki search using Elasticsearch
-merge_request:
-author:

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/2204-contrib-analytics-highlight-sub-nav.yml

----
-title: Highlight Contribution Analytics tab under groups when active, remove sub-nav
-  items.
-merge_request: 1677
-author:

changelogs/unreleased-ee/2222-deploy-boards-polling.yml

----
-title: Uses etag polling for deployboards
-merge_request: 1713
-author:

changelogs/unreleased-ee/2253-support-more-es-versions.yml

----
-title: Support more elasticsearch versions
-merge_request: 1716
-author:

changelogs/unreleased-ee/2274-improve-backfill.yml

----
-title: 'Geo: Resync repositories that have been updated recently'
-merge_request:
-author:

changelogs/unreleased-ee/2366-geo-sign-out-broken.yml

----
-title: Geo - Fix signing out from secondary node when "Remember me" option is checked
-merge_request: 1903
-author:

changelogs/unreleased-ee/31157-search-security-fix.yml

----
-title: Respect project features when searching alternative branches with elasticsearch
-  enabled
-merge_request:
-author:

changelogs/unreleased-ee/fix-mr-approval-sentence.yml

----
-title: Fix MR approvals sentence when all approvers need to approve the MR
-merge_request:
-author:

changelogs/unreleased-ee/hamlit-xss-fix-ee.yml

----
-title: Fix for XSS in project mirror errors caused by Hamlit filter usage.
-merge_request:
-author:
-

changelogs/unreleased-ee/license-check-using-feature-list.yml

----
-title: Feature availability check using feature list AND license addons
-merge_request:
-author:

changelogs/unreleased-ee/remove-superfluous-wording-on-push-rules.yml

----
-title: 'Remove superfluous wording on push rules'
-merge_request: 1811

changelogs/unreleased-ee/sh-test.yml

----
-title: Disable mirror workers for Geo secondaries
-merge_request:
-author:

changelogs/unreleased-ee/stop-using-sidekiq-cron-for-push-mirrors.yml

----
-title: Stop using sidekiq cron for push mirrors
-merge_request: 1616
-author:

changelogs/unreleased/12910-personal-snippet-prep-2.yml

----
-title: Support Markdown previews for personal snippets
-merge_request: 10810
-author:

changelogs/unreleased/12910-personal-snippets-notes-show.yml

----
-title: Display comments for personal snippets
-merge_request:
-author:

changelogs/unreleased/12910-personal-snippets-notes.yml

----
-title: Support comments for personal snippets
-merge_request:
-author:

changelogs/unreleased/12910-uploader-pers-snippet.yml

----
-title: Support uploaders for personal snippets comments
-merge_request:
-author:

changelogs/unreleased/1440-db-backup-ssl-support.yml

----
-title: Database SSL support for backup script.
-merge_request: 9715
-author: Guillaume Simon

changelogs/unreleased/17361-redirect-renamed-paths.yml

----
-title: Redirect old links after renaming a user/group/project.
-merge_request: 10370
-author:

changelogs/unreleased/19364-webhook-edit.yml

----
-title: Implement ability to edit hooks
-merge_request: 10816
-author: Alexander Randa

changelogs/unreleased/20378-natural-sort-issue-numbers.yml

----
-title: Change issues list in MR to natural sorting
-merge_request: 7110
-author: Jeff Stubler

changelogs/unreleased/21683-show-created-group-name-flash.yml

----
-title: Show group name on flash container when group is created from Admin area.
-merge_request: 10905
-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/22826-ui-inconsistency-different-files-views-find-file-button-missing.yml

----
-title: Fix UI inconsistency different files view (find file button missing)
-merge_request: 9847
-author: TM Lee

changelogs/unreleased/23751-add-contribution-graph-key-tooltips.yml

----
-title: Add tooltips to user contribution graph key
-merge_request: 11138
-author:

changelogs/unreleased/24883-build-failure-summary-page.yml

----
-title: Added build failures summary page for pipelines
-merge_request: 10719
-author:

changelogs/unreleased/25226-realtime-pipelines-fe.yml

----
-title: Re-rewrites pipeline graph in vue to support realtime data updates
-merge_request:
-author:

changelogs/unreleased/26208-animate-drodowns.yml

----
-title: Add animations to all the dropdowns
-merge_request: 8419
-author:

changelogs/unreleased/26437-closed-by.yml

----
-title: Add issues/:iid/closed_by api endpoint
-merge_request:
-author: mhasbini

changelogs/unreleased/26488-target-disabled-mr.yml

----
-title: Disallow merge requests from fork when source project have disabled merge requests
-merge_request:
-author: mhasbini

changelogs/unreleased/26509-show-update-time.yml

----
-title: Add update time to project lists.
-merge_request: 8514
-author: Jeff Stubler

changelogs/unreleased/26585-remove-readme-view-caching.yml

----
-title: 'Remove view fragment caching for project READMEs'
-merge_request: 8838
-author:

changelogs/unreleased/26883-members-page-layout-looks-broken.yml

----
-title: Improved UX on project members settings view
-merge_request:
-author:

changelogs/unreleased/27376-bvl-load-pipelinestatus-in-batch.yml

----
-title: Fetch pipeline status in batch from redis
-merge_request: 10785
-author:

changelogs/unreleased/27614-instant-comments.yml

----
-title: Add support for instantly updating comments
-merge_request: 10760
-author:

changelogs/unreleased/27655-clear-emoji-search-after-selection.yml

----
-title: Clear emoji search in awards menu after picking emoji
-merge_request:
-author:

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/27827-cleanup-markdown.yml

----
-title: Cleanup markdown spacing
-merge_request:
-author:

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

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