Merge branch 'master' into 1589-deploy-boards

* master: (467 commits)
  Fix the filtered search
  Resolve merge conflicts
  Fit GitAccess specs
  Fix new offenses
  Fix new offenses
  Stylistic tweaks
  Remove stray conflict
  Fix OAuth/SAML user blocking behavior
  Revert "Enable Style/DotPosition"
  Revert "Prefer leading style for Style/DotPosition"
  Revert "Enable Style/BarePercentLiterals"
  Manually correct autocorrect
  Move up delegate calls
  Exclude migrations from Style/MutableConstant
  ActiveSupport delegation is preferred over Forwardable
  Update haml_lint to work with newest rubocop
  Fix incorrect rubocop autocorrects
  Regenerate .rubocop_todo.yml for EE
  Fix EE offenses
  Add explanations to cops
  ...

.gitignore

@@ -51,3 +51,4 @@ eslint-report.html
 /builds/*
 /shared/*
 /.gitlab_workhorse_secret
+/webpack-report/

.gitlab-ci.yml

@@ -9,7 +9,7 @@ variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
   # retry tests only in CI environment
   RSPEC_RETRY_RETRY_COUNT: "3"
-  ELASTIC_HOST: "registry.gitlab.com-gitlab-org-test-elastic-image"
+  ELASTIC_HOST: "elasticsearch"
   RAILS_ENV: "test"
   SIMPLECOV: "true"
   SETUP_DB: "true"
@@ -17,6 +17,8 @@ variables:
   GIT_DEPTH: "20"
   PHANTOMJS_VERSION: "2.1.1"
   GET_SOURCES_ATTEMPTS: "3"
+  # This hack is needed to make ES not that memory hungry
+  ES_JAVA_OPTS: "-Xms600m -Xmx600m"
 
 before_script:
   - source ./scripts/prepare_build.sh
@@ -55,7 +57,7 @@ stages:
   services:
     - mysql:latest
     - redis:alpine
-    - registry.gitlab.com/gitlab-org/test-elastic-image
+    - elasticsearch:5.1
 
 .rspec-knapsack: &rspec-knapsack
   stage: test
@@ -222,7 +224,26 @@ rake db:seed_fu:
     paths:
       - log/development.log
 
-karma:
+rake gitlab:assets:compile:
+  stage: test
+  <<: *dedicated-runner
+  dependencies: []
+  variables:
+    NODE_ENV: "production"
+    RAILS_ENV: "production"
+    SETUP_DB: "false"
+    USE_DB: "false"
+    SKIP_STORAGE_VALIDATION: "true"
+    WEBPACK_REPORT: "true"
+  script:
+    - bundle exec rake yarn:install gitlab:assets:compile
+  artifacts:
+    name: webpack-report
+    expire_in: 31d
+    paths:
+    - webpack-report/
+
+rake karma:
   cache:
     paths:
       - vendor/ruby
@@ -263,7 +284,7 @@ bundler:audit:
     - master@gitlab/gitlabhq
     - master@gitlab/gitlab-ee
   script:
-    - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
+    - "bundle exec bundle-audit check --update --ignore OSVDB-115941 CVE-2016-6316 CVE-2016-6317"
 
 migration paths:
   stage: test
@@ -369,7 +390,8 @@ pages:
   <<: *dedicated-runner
   dependencies:
     - coverage
-    - karma
+    - rake karma
+    - rake gitlab:assets:compile
     - lint:javascript:report
   script:
     - mv public/ .public/
@@ -377,6 +399,7 @@ pages:
     - mv coverage/ public/coverage-ruby/ || true
     - mv coverage-javascript/ public/coverage-javascript/ || true
     - mv eslint-report.html public/ || true
+    - mv webpack-report/ public/webpack-report/ || true
   artifacts:
     paths:
       - public

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 8.17.0 (2017-02-22)
+
+- Read-only "auditor" user role. !998
+- Also reset approvals on push when merge request is closed. !1051
+- Copy commit SHA to clipboard. !1066
+- Pull EE specific Gitlab::Auth code in to its own module. !1112
+- Geo: Added `gitlab:geo:check` and improved `gitlab:envinfo` rake tasks. !1120
+- Geo: send the new event type with the backfill function. !1157
+- Re-add removed params from projects and issues V3 API. !1209
+- Add configurable minimum mirror sync time in admin section. !1217
+- Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue. !1234
+- Change Builds word to Pipelines in Mirror settings page.
+- Fix bundle tag in anaytics page.
+- Support v4 API for GitLab Geo endpoints.
+- Fixed merge request environment link not displaying.
+- Reduce queries needed to check if node is a primary or secondary Geo node.
+- Allow squashing merge requests into a single commit.
+
 ## 8.16.6 (2017-02-17)
 
 - Geo: send the new event type with the backfill function. !1157
 - Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue. !1234
 - Fixed merge request environment link not displaying.
 - Reduce queries needed to check if node is a primary or secondary Geo node.
+- Read true-up info from license and validate it. !1159
 
 ## 8.16.5 (2017-02-14)
 

GITLAB_PAGES_VERSION

-0.3.0
+0.3.2

Gemfile

 source 'https://rubygems.org'
 
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.8'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
 # Responders respond_to and respond_with
@@ -35,7 +35,7 @@ gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'gssapi', group: :kerberos
-gem 'omniauth-authentiq',     '~> 0.2.0'
+gem 'omniauth-authentiq',     '~> 0.3.0'
 gem 'rack-oauth2',            '~> 1.2.1'
 gem 'jwt',                    '~> 1.5.6'
 
@@ -104,9 +104,10 @@ gem 'unf', '~> 0.1.4'
 gem 'seed-fu', '~> 2.3.5'
 
 # Search
-gem 'elasticsearch-model'
-gem 'elasticsearch-rails'
-gem 'gitlab-elasticsearch-git', '~> 1.0.1', require: "elasticsearch/git"
+gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-rails', '~> 0.1.9'
+gem 'elasticsearch-api',   '5.0.3'
+gem 'gitlab-elasticsearch-git', '1.1.1', require: "elasticsearch/git"
 
 # Markdown and HTML processing
 gem 'html-pipeline',        '~> 1.11.0'
@@ -208,7 +209,7 @@ gem 'babosa', '~> 1.0.2'
 gem 'loofah', '~> 2.0.3'
 
 # Working with license
-gem 'licensee', '~> 8.0.0'
+gem 'licensee', '~> 8.7.0'
 
 # Protect against bruteforcing
 gem 'rack-attack', '~> 4.4.1'
@@ -309,10 +310,10 @@ group :development, :test do
   gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.1.0'
 
-  gem 'rubocop', '~> 0.46.0', require: false
-  gem 'rubocop-rspec', '~> 1.9.1', require: false
+  gem 'rubocop', '~> 0.47.1', require: false
+  gem 'rubocop-rspec', '~> 1.12.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
-  gem 'haml_lint', '~> 0.18.2', require: false
+  gem 'haml_lint', '~> 0.21.0', require: false
   gem 'simplecov', '0.12.0', require: false
   gem 'flay', '~> 2.6.1', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
@@ -341,7 +342,7 @@ gem 'newrelic_rpm', '~> 3.16'
 
 gem 'octokit', '~> 4.6.2'
 
-gem 'mail_room', '~> 0.9.0'
+gem 'mail_room', '~> 0.9.1'
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'

README.md

@@ -59,7 +59,7 @@ We're hiring developers, support people, and production engineers all the time,
 There are two editions of GitLab:
 
 - GitLab Community Edition (CE) is available freely under the MIT Expat license.
-- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/features/#compare) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
+- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/products/#compare-options) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/products/).
 
 ## Website
 

VERSION

-8.17.0-ee-pre
+8.18.0-ee-pre

app/assets/images/icon-merge-request-unmerged.svg

+<svg width="12" height="15" viewBox="0 0 12 15" xmlns="http://www.w3.org/2000/svg"><path d="M10.267 11.028V5.167c-.028-.728-.318-1.372-.878-1.923-.56-.55-1.194-.85-1.922-.877h-.934V.5l-2.8 2.8 2.8 2.8V4.233h.934a.976.976 0 0 1 .644.29.88.88 0 0 1 .289.644v5.861a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472zM3.733 3.3a1.86 1.86 0 0 0-1.866-1.867 1.86 1.86 0 0 0-.934 3.472v6.123a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472V4.905c.55-.317.933-.914.933-1.605z" fill-rule="nonzero"/></svg>

app/assets/javascripts/admin.js

@@ -61,4 +61,4 @@
 
     return Admin;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/admin_email_select.js

@@ -25,7 +25,7 @@
                 all = {
                   id: "all"
                 };
-                data = $.merge([all], groups[0], projects[0]);
+                data = [all].concat(groups[0], projects[0]);
                 return query.callback({
                   results: data
                 });
@@ -83,4 +83,4 @@
 
   })();
 
-}).call(this);
+}).call(window);

app/assets/javascripts/ajax_loading_spinner.js

+class AjaxLoadingSpinner {
+  static init() {
+    const $elements = $('.js-ajax-loading-spinner');
+
+    $elements.on('ajax:beforeSend', AjaxLoadingSpinner.ajaxBeforeSend);
+    $elements.on('ajax:complete', AjaxLoadingSpinner.ajaxComplete);
+  }
+
+  static ajaxBeforeSend(e) {
+    e.target.setAttribute('disabled', '');
+    const iconElement = e.target.querySelector('i');
+    // get first fa- icon
+    const originalIcon = iconElement.className.match(/(fa-)([^\s]+)/g).first();
+    iconElement.dataset.icon = originalIcon;
+    AjaxLoadingSpinner.toggleLoadingIcon(iconElement);
+    $(e.target).off('ajax:beforeSend', AjaxLoadingSpinner.ajaxBeforeSend);
+  }
+
+  static ajaxComplete(e) {
+    e.target.removeAttribute('disabled');
+    const iconElement = e.target.querySelector('i');
+    AjaxLoadingSpinner.toggleLoadingIcon(iconElement);
+    $(e.target).off('ajax:complete', AjaxLoadingSpinner.ajaxComplete);
+  }
+
+  static toggleLoadingIcon(iconElement) {
+    const classList = iconElement.classList;
+    classList.toggle(iconElement.dataset.icon);
+    classList.toggle('fa-spinner');
+    classList.toggle('fa-spin');
+  }
+}
+
+window.gl = window.gl || {};
+gl.AjaxLoadingSpinner = AjaxLoadingSpinner;

app/assets/javascripts/api.js

@@ -165,4 +165,4 @@
   };
 
   window.Api = Api;
-}).call(this);
+}).call(window);

app/assets/javascripts/application.js

@@ -248,4 +248,4 @@ require('es6-promise').polyfill();
 
     gl.utils.initTimeagoTimeout();
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/approvals.js

@@ -69,4 +69,4 @@
     });
   });
 
-}).call(this);
+}).call(window);

app/assets/javascripts/aside.js

@@ -22,4 +22,4 @@
 
     return Aside;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/autosave.js

@@ -59,4 +59,4 @@
 
     return Autosave;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/awards_handler.js

@@ -377,4 +377,4 @@ var emojiAliases = require('emoji-aliases');
 
     return AwardsHandler;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/autosize.js

@@ -25,4 +25,4 @@ var autosize = require('vendor/autosize');
     autosize.update($fields);
     return $fields.css('resize', 'vertical');
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/details_behavior.js

@@ -23,4 +23,4 @@
       return e.preventDefault();
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/quick_submit.js

@@ -74,4 +74,4 @@ require('../extensions/jquery');
       return $this.tooltip('hide');
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/requires_input.js

@@ -59,4 +59,4 @@ require('../extensions/jquery');
       return hideOrShowHelpBlock($form);
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_file_dropzone.js

@@ -63,4 +63,4 @@
 
     return BlobFileDropzone;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_gitignore_selector.js

@@ -20,4 +20,4 @@ require('./template_selector');
 
     return BlobGitignoreSelector;
   })(gl.TemplateSelector);
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_gitignore_selectors.js

@@ -23,4 +23,4 @@
 
     return BlobGitignoreSelectors;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_license_selector.js

@@ -25,4 +25,4 @@ require('./template_selector');
 
     return BlobLicenseSelector;
   })(gl.TemplateSelector);
-}).call(this);
+}).call(window);

app/assets/javascripts/blob_edit/blob_edit_bundle.js

@@ -12,4 +12,4 @@ require('./edit_blob');
     var blob = new EditBlob(url, $('.js-edit-blob-form').data('blob-language'));
     new NewCommitForm($('.js-edit-blob-form'));
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/blob_edit/edit_blob.js

@@ -85,4 +85,4 @@
 
     return EditBlob;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/boards/boards_bundle.js.es6

-/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren, import/newline-after-import, no-multi-spaces, max-len */
+/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren */
 /* global Vue */
 /* global BoardService */
 
-function requireAll(context) { return context.keys().map(context); }
-
 window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
-requireAll(require.context('./models',   true, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./stores',   true, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./services', true, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./mixins',   true, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./filters',  true, /^\.\/.*\.(js|es6)$/));
+require('./models/issue');
+require('./models/label');
+require('./models/list');
+require('./models/milestone');
+require('./models/user');
+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');
@@ -35,7 +39,6 @@ $(() => {
     el: $boardApp,
     components: {
       'board': gl.issueBoards.Board,
-      'boards-selector': gl.issueBoards.BoardsSelector,
       'board-sidebar': gl.issueBoards.BoardSidebar,
       'board-add-issues-modal': gl.issueBoards.IssuesModal,
     },
@@ -95,19 +98,62 @@ $(() => {
       modal: ModalStore.store,
       store: Store.state,
     },
+    watch: {
+      disabled() {
+        this.updateTooltip();
+      },
+    },
     computed: {
       disabled() {
         return !this.store.lists.filter(list => list.type !== 'blank' && list.type !== 'done').length;
       },
+      tooltipTitle() {
+        if (this.disabled) {
+          return 'Please add a list to your board first';
+        }
+
+        return '';
+      },
+    },
+    methods: {
+      updateTooltip() {
+        const $tooltip = $(this.$el);
+
+        this.$nextTick(() => {
+          if (this.disabled) {
+            $tooltip.tooltip();
+          } else {
+            $tooltip.tooltip('destroy');
+          }
+        });
+      },
+      openModal() {
+        if (!this.disabled) {
+          this.toggleModal(true);
+        }
+      },
+    },
+    mounted() {
+      this.updateTooltip();
     },
     template: `
       <button
-        class="btn btn-create pull-right prepend-left-10 has-tooltip"
+        class="btn btn-create pull-right prepend-left-10"
         type="button"
-        :disabled="disabled"
-        @click="toggleModal(true)">
+        data-placement="bottom"
+        :class="{ 'disabled': disabled }"
+        :title="tooltipTitle"
+        :aria-disabled="disabled"
+        @click="openModal">
         Add issues
       </button>
     `,
   });
+
+  gl.IssueboardsSwitcher = new Vue({
+    el: '#js-multiple-boards-switcher',
+    components: {
+      'boards-selector': gl.issueBoards.BoardsSelector,
+    }
+  });
 });

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

@@ -47,6 +47,9 @@
             Store.state.reload = true;
           });
       },
+      cancel() {
+        Store.state.currentPage = '';
+      },
     },
   });
 })();

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

@@ -64,6 +64,7 @@ require('./board_new_form');
     },
     methods: {
       showPage(page) {
+        this.state.reload = false;
         this.state.currentPage = page;
       },
       toggleDropdown() {

app/assets/javascripts/breakpoints.js

@@ -69,4 +69,4 @@
   })(this));
 
   window.Breakpoints = Breakpoints;
-}).call(this);
+}).call(window);

app/assets/javascripts/broadcast_message.js

@@ -31,4 +31,4 @@
       }
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/build.js

@@ -275,4 +275,4 @@
 
     return Build;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/build_artifacts.js

@@ -23,4 +23,4 @@
 
     return BuildArtifacts;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/commit.js

@@ -11,4 +11,4 @@
 
     return Commit;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/commit/file.js

@@ -11,4 +11,4 @@
 
     return CommitFile;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/commit/image_file.js

@@ -173,4 +173,4 @@
 
     return ImageFile;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/commits.js

@@ -65,4 +65,4 @@
 
     return CommitsList;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/compare.js

@@ -88,4 +88,4 @@
 
     return Compare;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/compare_autocomplete.js.es6

@@ -66,4 +66,4 @@
 
     return CompareAutocomplete;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/confirm_danger_modal.js

@@ -32,4 +32,4 @@
 
     return ConfirmDangerModal;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/copy_to_clipboard.js

@@ -46,4 +46,4 @@ window.Clipboard = require('vendor/clipboard');
     clipboard.on('success', genericSuccess);
     return clipboard.on('error', genericError);
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/create_label.js.es6

@@ -107,9 +107,9 @@
           if (typeof label.message === 'string') {
             errors = label.message;
           } else {
-            errors = label.message.map(function (value, key) {
-              return key + " " + value[0];
-            }).join("<br/>");
+            errors = Object.keys(label.message).map(key =>
+              `${gl.text.humanize(key)} ${label.message[key].join(', ')}`
+            ).join("<br/>");
           }
 
           this.$newLabelError

app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6

@@ -4,10 +4,20 @@
 
 window.Vue = require('vue');
 window.Cookies = require('js-cookie');
-
-function requireAll(context) { return context.keys().map(context); }
-requireAll(require.context('./svg', false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('.', true, /^\.\/(?!cycle_analytics_bundle).*\.(js|es6)$/));
+require('./svg/icon_branch');
+require('./svg/icon_build_status');
+require('./svg/icon_commit');
+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');
 
 $(() => {
   const OVERVIEW_DIALOG_COOKIE = 'cycle_analytics_help_dismissed';
@@ -97,7 +107,7 @@ $(() => {
         }
 
         this.isLoadingStage = true;
-        cycleAnalyticsStore.setStageEvents([]);
+        cycleAnalyticsStore.setStageEvents([], stage);
         cycleAnalyticsStore.setActiveStage(stage);
 
         cycleAnalyticsService
@@ -107,7 +117,7 @@ $(() => {
           })
           .done((response) => {
             this.isEmptyStage = !response.events.length;
-            cycleAnalyticsStore.setStageEvents(response.events);
+            cycleAnalyticsStore.setStageEvents(response.events, stage);
           })
           .error(() => {
             this.isEmptyStage = true;

app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6

 /* eslint-disable no-param-reassign */
+
+require('../lib/utils/text_utility');
+const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
+
 ((global) => {
   global.cycleAnalytics = global.cycleAnalytics || {};
 
@@ -34,11 +38,12 @@
       });
 
       newData.stages.forEach((item) => {
-        const stageName = item.title.toLowerCase();
+        const stageSlug = gl.text.dasherize(item.title.toLowerCase());
         item.active = false;
-        item.isUserAllowed = data.permissions[stageName];
-        item.emptyStageText = EMPTY_STAGE_TEXTS[stageName];
-        item.component = `stage-${stageName}-component`;
+        item.isUserAllowed = data.permissions[stageSlug];
+        item.emptyStageText = EMPTY_STAGE_TEXTS[stageSlug];
+        item.component = `stage-${stageSlug}-component`;
+        item.slug = stageSlug;
       });
       newData.analytics = data;
       return newData;
@@ -58,31 +63,33 @@
       this.deactivateAllStages();
       stage.active = true;
     },
-    setStageEvents(events) {
-      this.state.events = this.decorateEvents(events);
+    setStageEvents(events, stage) {
+      this.state.events = this.decorateEvents(events, stage);
     },
-    decorateEvents(events) {
+    decorateEvents(events, stage) {
       const newEvents = [];
 
       events.forEach((item) => {
         if (!item) return;
 
-        item.totalTime = item.total_time;
-        item.author.webUrl = item.author.web_url;
-        item.author.avatarUrl = item.author.avatar_url;
+        const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
+
+        eventItem.totalTime = eventItem.total_time;
+        eventItem.author.webUrl = eventItem.author.web_url;
+        eventItem.author.avatarUrl = eventItem.author.avatar_url;
 
-        if (item.created_at) item.createdAt = item.created_at;
-        if (item.short_sha) item.shortSha = item.short_sha;
-        if (item.commit_url) item.commitUrl = item.commit_url;
+        if (eventItem.created_at) eventItem.createdAt = eventItem.created_at;
+        if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha;
+        if (eventItem.commit_url) eventItem.commitUrl = eventItem.commit_url;
 
-        delete item.author.web_url;
-        delete item.author.avatar_url;
-        delete item.total_time;
-        delete item.created_at;
-        delete item.short_sha;
-        delete item.commit_url;
+        delete eventItem.author.web_url;
+        delete eventItem.author.avatar_url;
+        delete eventItem.total_time;
+        delete eventItem.created_at;
+        delete eventItem.short_sha;
+        delete eventItem.commit_url;
 
-        newEvents.push(item);
+        newEvents.push(eventItem);
       });
 
       return newEvents;

app/assets/javascripts/cycle_analytics/default_event_objects.js.es6

+module.exports = {
+  issue: {
+    created_at: '',
+    url: '',
+    iid: '',
+    title: '',
+    total_time: {},
+    author: {
+      avatar_url: '',
+      id: '',
+      name: '',
+      web_url: '',
+    },
+  },
+  plan: {
+    title: '',
+    commit_url: '',
+    short_sha: '',
+    total_time: {},
+    author: {
+      name: '',
+      id: '',
+      avatar_url: '',
+      web_url: '',
+    },
+  },
+  code: {
+    title: '',
+    iid: '',
+    created_at: '',
+    url: '',
+    total_time: {},
+    author: {
+      name: '',
+      id: '',
+      avatar_url: '',
+      web_url: '',
+    },
+  },
+  test: {
+    name: '',
+    id: '',
+    date: '',
+    url: '',
+    short_sha: '',
+    commit_url: '',
+    total_time: {},
+    branch: {
+      name: '',
+      url: '',
+    },
+  },
+  review: {
+    title: '',
+    iid: '',
+    created_at: '',
+    url: '',
+    state: '',
+    total_time: {},
+    author: {
+      name: '',
+      id: '',
+      avatar_url: '',
+      web_url: '',
+    },
+  },
+  staging: {
+    id: '',
+    short_sha: '',
+    date: '',
+    url: '',
+    commit_url: '',
+    total_time: {},
+    author: {
+      name: '',
+      id: '',
+      avatar_url: '',
+      web_url: '',
+    },
+    branch: {
+      name: '',
+      url: '',
+    },
+  },
+  production: {
+    title: '',
+    created_at: '',
+    url: '',
+    iid: '',
+    total_time: {},
+    author: {
+      name: '',
+      id: '',
+      avatar_url: '',
+      web_url: '',
+    },
+  },
+};

app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6

-/* eslint-disable func-names, comma-dangle, new-cap, no-new, import/newline-after-import, no-multi-spaces, max-len */
+/* eslint-disable func-names, comma-dangle, new-cap, no-new, max-len */
 /* global Vue */
 /* global ResolveCount */
 /* global ResolveServiceClass */
 
-function requireAll(context) { return context.keys().map(context); }
 const Vue = require('vue');
-requireAll(require.context('./models',     false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./stores',     false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./services',   false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./mixins',     false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('./components', false, /^\.\/.*\.(js|es6)$/));
+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');
 
 $(() => {
   const projectPath = document.querySelector('.merge-request').dataset.projectPath;

app/assets/javascripts/dispatcher.js.es6

@@ -76,7 +76,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
         case 'projects:merge_requests:index':
         case 'projects:issues:index':
           if (gl.FilteredSearchManager) {
-            new gl.FilteredSearchManager();
+            new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests');
           }
           Issuable.init();
           new gl.IssuableBulkActions({
@@ -110,6 +110,9 @@ const ShortcutsBlob = require('./shortcuts_blob');
         case 'projects:compare:show':
           new gl.Diff();
           break;
+        case 'projects:branches:index':
+          gl.AjaxLoadingSpinner.init();
+          break;
         case 'projects:issues:new':
         case 'projects:issues:edit':
           shortcut_handler = new ShortcutsNavigation();
@@ -396,4 +399,4 @@ const ShortcutsBlob = require('./shortcuts_blob');
 
     return Dispatcher;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/dropzone_input.js

@@ -126,13 +126,14 @@ require('./preview_markdown');
       };
       pasteText = function(text) {
         var afterSelection, beforeSelection, caretEnd, caretStart, textEnd;
+        var formattedText = text + "\n\n";
         caretStart = $(child)[0].selectionStart;
         caretEnd = $(child)[0].selectionEnd;
         textEnd = $(child).val().length;
         beforeSelection = $(child).val().substring(0, caretStart);
         afterSelection = $(child).val().substring(caretEnd, textEnd);
-        $(child).val(beforeSelection + text + afterSelection);
-        child.get(0).setSelectionRange(caretStart + text.length, caretEnd + text.length);
+        $(child).val(beforeSelection + formattedText + afterSelection);
+        child.get(0).setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length);
         return form_textarea.trigger("input");
       };
       getFilename = function(e) {
@@ -216,4 +217,4 @@ require('./preview_markdown');
 
     return DropzoneInput;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/environments/components/environment_actions.js.es6

@@ -15,29 +15,29 @@ module.exports = Vue.component('actions-component', {
   },
 
   template: `
-    <div class="inline">
-      <div class="dropdown">
-        <a class="dropdown-new btn btn-default" data-toggle="dropdown">
+    <div class="btn-group" role="group">
+      <button class="dropdown btn btn-default dropdown-new" data-toggle="dropdown">
+        <span>
           <span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
           <i class="fa fa-caret-down"></i>
-        </a>
+        </span>
 
-        <ul class="dropdown-menu dropdown-menu-align-right">
-          <li v-for="action in actions">
-            <a :href="action.play_path"
-              data-method="post"
-              rel="nofollow"
-              class="js-manual-action-link">
+      <ul class="dropdown-menu dropdown-menu-align-right">
+        <li v-for="action in actions">
+          <a :href="action.play_path"
+            data-method="post"
+            rel="nofollow"
+            class="js-manual-action-link">
 
-              <span class="js-action-play-icon-container" v-html="playIconSvg"></span>
+            <span class="js-action-play-icon-container" v-html="playIconSvg"></span>
 
-              <span>
-                {{action.name}}
-              </span>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
+            <span>
+              {{action.name}}
+            </span>
+          </a>
+        </li>
+      </ul>
+    </button>
+  </div>
   `,
 });

app/assets/javascripts/environments/components/environment_item.js.es6

@@ -525,39 +525,26 @@ module.exports = Vue.component('environment-item', {
 
       <td class="hidden-xs">
         <div v-if="!model.isFolder">
-          <div v-if="hasManualActions && canCreateDeployment"
-            class="inline js-manual-actions-container">
-            <actions-component
+          <div class="btn-group" role="group">
+            <actions-component v-if="hasManualActions && canCreateDeployment"
               :play-icon-svg="playIconSvg"
               :actions="manualActions">
             </actions-component>
-          </div>
 
-          <div v-if="externalURL && canReadEnvironment"
-            class="inline js-external-url-container">
-            <external-url-component
+            <external-url-component v-if="externalURL && canReadEnvironment"
               :external-url="externalURL">
             </external-url-component>
-          </div>
 
-          <div v-if="hasStopAction && canCreateDeployment"
-            class="inline js-stop-component-container">
-            <stop-component
+            <stop-component v-if="hasStopAction && canCreateDeployment"
               :stop-url="model.stop_path">
             </stop-component>
-          </div>
 
-          <div v-if="model && model.terminal_path"
-            class="inline js-terminal-button-container">
-            <terminal-button-component
+            <terminal-button-component v-if="model && model.terminal_path"
               :terminal-icon-svg="terminalIconSvg"
               :terminal-path="model.terminal_path">
             </terminal-button-component>
-          </div>
 
-          <div v-if="canRetry && canCreateDeployment"
-            class="inline js-rollback-component-container">
-            <rollback-component
+            <rollback-component v-if="canRetry && canCreateDeployment"
               :is-last-deployment="isLastDeployment"
               :retry-url="retryUrl">
               </rollback-component>

app/assets/javascripts/extensions/jquery.js

@@ -13,4 +13,4 @@
       return $(this).removeAttr('disabled').removeClass('disabled');
     }
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/files_comment_button.js

@@ -144,4 +144,4 @@
       }
     });
   };
-}).call(this);
+}).call(window);

app/assets/javascripts/filtered_search/dropdown_hint.js.es6

@@ -37,27 +37,18 @@ require('./filtered_search_dropdown');
     }
 
     renderContent() {
-      const dropdownData = [{
-        icon: 'fa-pencil',
-        hint: 'author:',
-        tag: '<@author>',
-      }, {
-        icon: 'fa-user',
-        hint: 'assignee:',
-        tag: '<@assignee>',
-      }, {
-        icon: 'fa-clock-o',
-        hint: 'milestone:',
-        tag: '<%milestone>',
-      }, {
-        icon: 'fa-tag',
-        hint: 'label:',
-        tag: '<~label>',
-      }, {
-        icon: 'fa-balance-scale',
-        hint: 'weight:',
-        tag: '<weight>',
-      }];
+      const dropdownData = [];
+
+      [].forEach.call(this.input.parentElement.querySelectorAll('.dropdown-menu'), (dropdownMenu) => {
+        const { icon, hint, tag } = dropdownMenu.dataset;
+        if (icon && hint && tag) {
+          dropdownData.push({
+            icon: `fa-${icon}`,
+            hint,
+            tag: `<${tag}>`,
+          });
+        }
+      });
 
       this.droplab.changeHookList(this.hookId, this.dropdown, [droplabFilter], this.config);
       this.droplab.setData(this.hookId, dropdownData);

app/assets/javascripts/filtered_search/filtered_search_bundle.js

-function requireAll(context) { return context.keys().map(context); }
-
-requireAll(require.context('./', true, /^\.\/(?!filtered_search_bundle).*\.(js|es6)$/));
+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_token_keys_with_weights');
+require('./filtered_search_tokenizer');

app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6

@@ -52,8 +52,9 @@
     }
 
     renderContent(forceShowList = false) {
-      if (forceShowList && this.getCurrentHook().list.hidden) {
-        this.getCurrentHook().list.show();
+      const currentHook = this.getCurrentHook();
+      if (forceShowList && currentHook && currentHook.list.hidden) {
+        currentHook.list.show();
       }
     }
 
@@ -92,18 +93,24 @@
     }
 
     hideDropdown() {
-      this.getCurrentHook().list.hide();
+      const currentHook = this.getCurrentHook();
+      if (currentHook) {
+        currentHook.list.hide();
+      }
     }
 
     resetFilters() {
       const hook = this.getCurrentHook();
-      const data = hook.list.data;
-      const results = data.map((o) => {
-        const updated = o;
-        updated.droplab_hidden = false;
-        return updated;
-      });
-      hook.list.render(results);
+
+      if (hook) {
+        const data = hook.list.data;
+        const results = data.map((o) => {
+          const updated = o;
+          updated.droplab_hidden = false;
+          return updated;
+        });
+        hook.list.render(results);
+      }
     }
   }
 

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6

@@ -2,10 +2,16 @@
 
 (() => {
   class FilteredSearchDropdownManager {
-    constructor(baseEndpoint = '') {
+    constructor(baseEndpoint = '', page) {
       this.baseEndpoint = baseEndpoint.replace(/\/$/, '');
       this.tokenizer = gl.FilteredSearchTokenizer;
+      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
       this.filteredSearchInput = document.querySelector('.filtered-search');
+      this.page = page;
+
+      if (this.page === 'issues') {
+        this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
+      }
 
       this.setupMapping();
 
@@ -48,17 +54,20 @@
           extraArguments: [`${this.baseEndpoint}/labels.json`, '~'],
           element: document.querySelector('#js-dropdown-label'),
         },
-        weight: {
-          reference: null,
-          gl: 'DropdownNonUser',
-          element: document.querySelector('#js-dropdown-weight'),
-        },
         hint: {
           reference: null,
           gl: 'DropdownHint',
           element: document.querySelector('#js-dropdown-hint'),
         },
       };
+
+      if (this.page === 'issues') {
+        this.mapping.weight = {
+          reference: null,
+          gl: 'DropdownNonUser',
+          element: document.querySelector('#js-dropdown-weight'),
+        };
+      }
     }
 
     static addWordToInput(tokenName, tokenValue = '') {
@@ -155,7 +164,7 @@
         this.droplab = new DropLab();
       }
 
-      const match = gl.FilteredSearchTokenKeys.searchByKey(dropdownName.toLowerCase());
+      const match = this.filteredSearchTokenKeys.searchByKey(dropdownName.toLowerCase());
       const shouldOpenFilterDropdown = match && this.currentDropdown !== match.key
         && this.mapping[match.key];
       const shouldOpenHintDropdown = !match && this.currentDropdown !== 'hint';

app/assets/javascripts/filtered_search/filtered_search_manager.js.es6

 (() => {
   class FilteredSearchManager {
-    constructor() {
+    constructor(page) {
       this.filteredSearchInput = document.querySelector('.filtered-search');
       this.clearSearchButton = document.querySelector('.clear-search');
+      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
+
+      if (page === 'issues') {
+        this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
+      }
 
       if (this.filteredSearchInput) {
         this.tokenizer = gl.FilteredSearchTokenizer;
-        this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '');
+        this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '', page);
 
         this.bindEvents();
         this.loadSearchParamsFromURL();
@@ -117,8 +122,8 @@
         const keyParam = decodeURIComponent(split[0]);
         const value = split[1];
 
-        // Check if it matches edge conditions listed in gl.FilteredSearchTokenKeys
-        const condition = gl.FilteredSearchTokenKeys.searchByConditionUrl(p);
+        // Check if it matches edge conditions listed in this.filteredSearchTokenKeys
+        const condition = this.filteredSearchTokenKeys.searchByConditionUrl(p);
 
         if (condition) {
           inputValues.push(`${condition.tokenKey}:${condition.value}`);
@@ -126,7 +131,7 @@
           // Sanitize value since URL converts spaces into +
           // Replace before decode so that we know what was originally + versus the encoded +
           const sanitizedValue = value ? decodeURIComponent(value.replace(/\+/g, ' ')) : value;
-          const match = gl.FilteredSearchTokenKeys.searchByKeyParam(keyParam);
+          const match = this.filteredSearchTokenKeys.searchByKeyParam(keyParam);
 
           if (match) {
             const indexOf = keyParam.indexOf('_');
@@ -171,9 +176,9 @@
       paths.push(`state=${currentState}`);
 
       tokens.forEach((token) => {
-        const condition = gl.FilteredSearchTokenKeys
+        const condition = this.filteredSearchTokenKeys
           .searchByConditionKeyValue(token.key, token.value.toLowerCase());
-        const { param } = gl.FilteredSearchTokenKeys.searchByKey(token.key);
+        const { param } = this.filteredSearchTokenKeys.searchByKey(token.key) || {};
         const keyParam = param ? `${token.key}_${param}` : token.key;
         let tokenPath = '';
 

app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6

@@ -19,11 +19,6 @@
     type: 'array',
     param: 'name[]',
     symbol: '~',
-  }, {
-    key: 'weight',
-    type: 'string',
-    param: '',
-    symbol: '',
   }];
 
   const alternativeTokenKeys = [{
@@ -51,14 +46,6 @@
     url: 'label_name[]=No+Label',
     tokenKey: 'label',
     value: 'none',
-  }, {
-    url: 'weight=No+Weight',
-    tokenKey: 'weight',
-    value: 'none',
-  }, {
-    url: 'weight=Any+Weight',
-    tokenKey: 'weight',
-    value: 'any',
   }];
 
   class FilteredSearchTokenKeys {

app/assets/javascripts/filtered_search/filtered_search_token_keys_with_weights.js.es6

+require('./filtered_search_token_keys');
+
+const weightTokenKey = {
+  key: 'weight',
+  type: 'string',
+  param: '',
+  symbol: '',
+};
+
+const weightConditions = [{
+  url: 'weight=No+Weight',
+  tokenKey: 'weight',
+  value: 'none',
+}, {
+  url: 'weight=Any+Weight',
+  tokenKey: 'weight',
+  value: 'any',
+}];
+
+class FilteredSearchTokenKeysWithWeights extends gl.FilteredSearchTokenKeys {
+  static get() {
+    const tokenKeys = super.get();
+    tokenKeys.push(weightTokenKey);
+    return tokenKeys;
+  }
+
+  static getAlternatives() {
+    return super.getAlternatives();
+  }
+
+  static getConditions() {
+    const conditions = super.getConditions();
+    return conditions.concat(weightConditions);
+  }
+
+  static searchByKey(key) {
+    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    return tokenKeys.find(tokenKey => tokenKey.key === key) || null;
+  }
+
+  static searchBySymbol(symbol) {
+    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    return tokenKeys.find(tokenKey => tokenKey.symbol === symbol) || null;
+  }
+
+  static searchByKeyParam(keyParam) {
+    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    const alternativeTokenKeys = FilteredSearchTokenKeysWithWeights.getAlternatives();
+    const tokenKeysWithAlternative = tokenKeys.concat(alternativeTokenKeys);
+
+    return tokenKeysWithAlternative.find((tokenKey) => {
+      let tokenKeyParam = tokenKey.key;
+
+      if (tokenKey.param) {
+        tokenKeyParam += `_${tokenKey.param}`;
+      }
+
+      return keyParam === tokenKeyParam;
+    }) || null;
+  }
+
+  static searchByConditionUrl(url) {
+    const conditions = FilteredSearchTokenKeysWithWeights.getConditions();
+    return conditions.find(condition => condition.url === url) || null;
+  }
+
+  static searchByConditionKeyValue(key, value) {
+    const conditions = FilteredSearchTokenKeysWithWeights.getConditions();
+    return conditions
+      .find(condition => condition.tokenKey === key && condition.value === value) || null;
+  }
+}
+
+window.gl = window.gl || {};
+gl.FilteredSearchTokenKeysWithWeights = FilteredSearchTokenKeysWithWeights;

app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6

+require('./filtered_search_token_keys');
+
 (() => {
   class FilteredSearchTokenizer {
     static processTokens(input) {
+      const allowedKeys = gl.FilteredSearchTokenKeys.get().map(i => i.key);
       // Regex extracts `(token):(symbol)(value)`
       // Values that start with a double quote must end in a double quote (same for single)
-      const tokenRegex = /(\w+):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\S+))/g;
+      const tokenRegex = new RegExp(`(${allowedKeys.join('|')}):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`, 'g');
       const tokens = [];
       let lastToken = null;
       const searchToken = input.replace(tokenRegex, (match, key, symbol, v1, v2, v3) => {

app/assets/javascripts/flash.js

@@ -39,4 +39,4 @@
 
     return Flash;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/gfm_auto_complete.js.es6

@@ -83,12 +83,12 @@
         _a = decodeURI("%C3%80");
         _y = decodeURI("%C3%BF");
 
-        regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?![" + atSymbolsWithBar + "])(([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
+        regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?!" + atSymbolsWithBar + ")((?:[A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
 
         match = regexp.exec(subtext);
 
         if (match) {
-          return (match[1] || match[1] === "") ? match[1] : match[2];
+          return match[1];
         } else {
           return null;
         }
@@ -380,4 +380,4 @@
         (dataToInspect === loadingState || dataToInspect.name === loadingState);
     }
   };
-}).call(this);
+}).call(window);

app/assets/javascripts/gl_dropdown.js

@@ -47,9 +47,10 @@
           }
           // Only filter asynchronously only if option remote is set
           if (this.options.remote) {
-            $inputContainer.parent().addClass('is-loading');
             clearTimeout(timeout);
             return timeout = setTimeout(function() {
+              $inputContainer.parent().addClass('is-loading');
+
               return this.options.query(this.input.val(), function(data) {
                 $inputContainer.parent().removeClass('is-loading');
                 return this.options.callback(data);
@@ -846,4 +847,4 @@
       }
     });
   };
-}).call(this);
+}).call(window);

app/assets/javascripts/graphs/graphs_bundle.js

-// require everything else in this directory
-function requireAll(context) { return context.keys().map(context); }
-requireAll(require.context('.', false, /^\.\/(?!graphs_bundle).*\.(js|es6)$/));
+require('./stat_graph_contributors_graph');
+require('./stat_graph_contributors_util');
+require('./stat_graph_contributors');
+require('./stat_graph');

app/assets/javascripts/graphs/stat_graph.js

@@ -15,4 +15,4 @@
 
     return StatGraph;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/graphs/stat_graph_contributors.js

@@ -113,4 +113,4 @@ window.d3 = require('d3');
 
     return ContributorsStatGraph;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/graphs/stat_graph_contributors_graph.js

@@ -273,4 +273,4 @@ window.d3 = require('d3');
 
     return ContributorsAuthorGraph;
   })(ContributorsGraph);
-}).call(this);
+}).call(window);

app/assets/javascripts/graphs/stat_graph_contributors_util.js

@@ -135,4 +135,4 @@
       }
     }
   };
-}).call(this);
+}).call(window);

app/assets/javascripts/group_avatar.js

@@ -17,4 +17,4 @@
 
     return GroupAvatar;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/groups_select.js

@@ -68,4 +68,4 @@
 
     return GroupsSelect;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/header.js

@@ -2,7 +2,7 @@
 (function() {
   $(document).on('todo:toggle', function(e, count) {
     var $todoPendingCount = $('.todos-pending-count');
-    $todoPendingCount.text(gl.text.addDelimiter(count));
+    $todoPendingCount.text(gl.text.highCountTrim(count));
     $todoPendingCount.toggleClass('hidden', count === 0);
   });
 })();

app/assets/javascripts/importer_status.js

@@ -78,4 +78,4 @@
       new window.ImporterStatus(jobsImportPath, importPath);
     }
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/issuable_context.js

@@ -76,4 +76,4 @@
 
     return IssuableContext;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/issuable_form.js

@@ -158,4 +158,4 @@
 
     return IssuableForm;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/issue.js

@@ -132,4 +132,4 @@ require('./task_list');
 
     return Issue;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/issue_status_select.js

@@ -31,4 +31,4 @@
 
     return IssueStatusSelect;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/labels.js

@@ -43,4 +43,4 @@
 
     return Labels;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/labels_select.js

@@ -504,4 +504,4 @@
 
     return LabelsSelect;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/layout_nav.js

@@ -44,4 +44,4 @@
       }
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/ldap_groups_select.js

@@ -48,4 +48,4 @@
     });
   });
 
-}).call(this);
+}).call(window);

app/assets/javascripts/lib/cropper.js

@@ -4,4 +4,4 @@
 
 (function() {
 
-}).call(this);
+}).call(window);

app/assets/javascripts/lib/raphael.js

@@ -6,4 +6,4 @@
 
 (function() {
 
-}).call(this);
+}).call(window);

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

@@ -46,4 +46,4 @@
       return dfd.promise();
     };
   })(window);
-}).call(this);
+}).call(window);

app/assets/javascripts/lib/utils/common_utils.js.es6

@@ -349,4 +349,4 @@
       });
     };
   })(window);
-}).call(this);
+}).call(window);

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

@@ -123,4 +123,4 @@ window.dateFormat = require('vendor/date.format');
       return Math.floor((date2 - date1) / millisecondsPerDay);
     };
   })(window);
-}).call(this);
+}).call(window);

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

@@ -44,4 +44,4 @@
     w.notify = notifyMe;
     return w.notifyPermissions = notifyPermissions;
   })(window);
-}).call(this);
+}).call(window);

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 */
 
+require('vendor/latinise');
+
 (function() {
   (function(w) {
     var base;
@@ -12,6 +14,9 @@
     gl.text.addDelimiter = function(text) {
       return text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : text;
     };
+    gl.text.highCountTrim = function(count) {
+      return count > 99 ? '99+' : count;
+    };
     gl.text.randomString = function() {
       return Math.random().toString(36).substring(7);
     };
@@ -164,8 +169,14 @@
     gl.text.pluralize = function(str, count) {
       return str + (count > 1 || count === 0 ? 's' : '');
     };
-    return gl.text.truncate = function(string, maxLength) {
+    gl.text.truncate = function(string, maxLength) {
       return string.substr(0, (maxLength - 3)) + '...';
     };
+    gl.text.dasherize = function(str) {
+      return str.replace(/[_\s]+/g, '-');
+    };
+    gl.text.slugify = function(str) {
+      return str.trim().toLowerCase().latinise();
+    };
   })(window);
-}).call(this);
+}).call(window);

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

@@ -12,4 +12,4 @@
       return (obj != null) && (obj.constructor === Object);
     };
   })(window);
-}).call(this);
+}).call(window);

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

@@ -83,4 +83,4 @@
       document.location.href = url;
     };
   })(window);
-}).call(this);
+}).call(window);

app/assets/javascripts/line_highlighter.js

@@ -179,4 +179,4 @@ require('vendor/jquery.scrollTo');
 
     return LineHighlighter;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/logo.js

@@ -4,4 +4,4 @@
   window.addEventListener('beforeunload', function() {
     $('.tanuki-logo').addClass('animate');
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/member_expiration_date.js.es6

@@ -49,4 +49,4 @@
 
     inputs.each(toggleClearInput);
   };
-}).call(this);
+}).call(window);

app/assets/javascripts/merge_request.js

@@ -108,4 +108,4 @@ require('./merge_request_tabs');
 
     return MergeRequest;
   })();
-}).call(this);
+}).call(window);