Merge branch 'nt/ce-to-ee-thursday' into 'master'

CE upstream: Thursday

Closes #2246

See merge request !1749

.gitlab-ci.yml

@@ -12,6 +12,7 @@ variables:
   NODE_ENV: "test"
   SIMPLECOV: "true"
   GIT_DEPTH: "20"
+  GIT_SUBMODULE_STRATEGY: "none"
   PHANTOMJS_VERSION: "2.1.1"
   GET_SOURCES_ATTEMPTS: "3"
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json

.gitlab/issue_templates/Bug.md

@@ -26,6 +26,7 @@ logs, and code as it's very hard to read otherwise.)
 #### Results of GitLab environment info
 
 <details>
+<pre>
 
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:env:info`)
@@ -33,11 +34,13 @@ logs, and code as it's very hard to read otherwise.)
 (For installations from source run and paste the output of:
 `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
 
+</pre>
 </details>
 
 #### Results of GitLab application Check
 
 <details>
+<pre>
 
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:check SANITIZE=true`)
@@ -47,6 +50,7 @@ logs, and code as it's very hard to read otherwise.)
 
 (we will only investigate if the tests are passing)
 
+</pre>
 </details>
 
 ### Possible fixes

Gemfile

@@ -154,7 +154,7 @@ gem 'after_commit_queue', '~> 1.3.0'
 gem 'acts-as-taggable-on', '~> 4.0'
 
 # Background jobs
-gem 'sidekiq', '~> 4.2.7'
+gem 'sidekiq', '~> 5.0'
 gem 'sidekiq-cron', '~> 0.4.4'
 gem 'redis-namespace', '~> 1.5.2'
 gem 'sidekiq-limit_fetch', '~> 3.4'
@@ -304,6 +304,7 @@ group :development, :test do
   gem 'spinach-rails', '~> 0.2.1'
   gem 'spinach-rerun-reporter', '~> 0.0.2'
   gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec-set', '~> 0.1.3'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.7.0'

Gemfile.lock

@@ -465,7 +465,7 @@ GEM
       multi_json (~> 1.10)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     mail_room (0.9.1)
     memoist (0.15.0)
@@ -639,7 +639,7 @@ GEM
       json
     recursive-open-struct (1.0.0)
     redcarpet (3.4.0)
-    redis (3.2.2)
+    redis (3.3.3)
     redis-actionpack (5.0.1)
       actionpack (>= 4.0, < 6)
       redis-rack (>= 1, < 3)
@@ -695,6 +695,7 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-retry (0.4.5)
       rspec-core
+    rspec-set (0.1.3)
     rspec-support (3.5.0)
     rspec_profiling (0.0.5)
       activerecord
@@ -752,11 +753,11 @@ GEM
       rack
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.2.10)
+    sidekiq (5.0.0)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (~> 3.3, >= 3.3.3)
     sidekiq-cron (0.4.4)
       redis-namespace (>= 1.5.2)
       rufus-scheduler (>= 2.0.24)
@@ -1034,6 +1035,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
+  rspec-set (~> 0.1.3)
   rspec_profiling (~> 0.0.5)
   rubocop (~> 0.47.1)
   rubocop-rspec (~> 1.15.0)
@@ -1050,7 +1052,7 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 4.2.7)
+  sidekiq (~> 5.0)
   sidekiq-cron (~> 0.4.4)
   sidekiq-limit_fetch (~> 3.4)
   simplecov (~> 0.14.0)

README.md

@@ -4,6 +4,7 @@
 [![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ee/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ee/pipelines)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
 [![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
+[![Gitter](https://badges.gitter.im/gitlabhq/gitlabhq.svg)](https://gitter.im/gitlabhq/gitlabhq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 ## Test coverage
 

app/assets/javascripts/commit/pipelines/pipelines_table.js

@@ -106,15 +106,6 @@ export default Vue.component('pipelines-table', {
     eventHub.$on('refreshPipelines', this.fetchPipelines);
   },
 
-  beforeUpdate() {
-    if (this.state.pipelines.length &&
-        this.$children &&
-        !this.isMakingRequest &&
-        !this.isLoading) {
-      this.store.startTimeAgoLoops.call(this, Vue);
-    }
-  },
-
   beforeDestroyed() {
     eventHub.$off('refreshPipelines');
   },

app/assets/javascripts/filtered_search/filtered_search_manager.js

@@ -81,13 +81,14 @@ class FilteredSearchManager {
     this.checkForEnterWrapper = this.checkForEnter.bind(this);
     this.onClearSearchWrapper = this.onClearSearch.bind(this);
     this.checkForBackspaceWrapper = this.checkForBackspace.bind(this);
-    this.removeSelectedTokenWrapper = this.removeSelectedToken.bind(this);
+    this.removeSelectedTokenKeydownWrapper = this.removeSelectedTokenKeydown.bind(this);
     this.unselectEditTokensWrapper = this.unselectEditTokens.bind(this);
     this.editTokenWrapper = this.editToken.bind(this);
     this.tokenChange = this.tokenChange.bind(this);
     this.addInputContainerFocusWrapper = this.addInputContainerFocus.bind(this);
     this.removeInputContainerFocusWrapper = this.removeInputContainerFocus.bind(this);
     this.onrecentSearchesItemSelectedWrapper = this.onrecentSearchesItemSelected.bind(this);
+    this.removeTokenWrapper = this.removeToken.bind(this);
 
     this.filteredSearchInputForm.addEventListener('submit', this.handleFormSubmit);
     this.filteredSearchInput.addEventListener('input', this.setDropdownWrapper);
@@ -100,12 +101,13 @@ class FilteredSearchManager {
     this.filteredSearchInput.addEventListener('keyup', this.tokenChange);
     this.filteredSearchInput.addEventListener('focus', this.addInputContainerFocusWrapper);
     this.tokensContainer.addEventListener('click', FilteredSearchManager.selectToken);
+    this.tokensContainer.addEventListener('click', this.removeTokenWrapper);
     this.tokensContainer.addEventListener('dblclick', this.editTokenWrapper);
     this.clearSearchButton.addEventListener('click', this.onClearSearchWrapper);
     document.addEventListener('click', gl.FilteredSearchVisualTokens.unselectTokens);
     document.addEventListener('click', this.unselectEditTokensWrapper);
     document.addEventListener('click', this.removeInputContainerFocusWrapper);
-    document.addEventListener('keydown', this.removeSelectedTokenWrapper);
+    document.addEventListener('keydown', this.removeSelectedTokenKeydownWrapper);
     eventHub.$on('recentSearchesItemSelected', this.onrecentSearchesItemSelectedWrapper);
   }
 
@@ -121,12 +123,13 @@ class FilteredSearchManager {
     this.filteredSearchInput.removeEventListener('keyup', this.tokenChange);
     this.filteredSearchInput.removeEventListener('focus', this.addInputContainerFocusWrapper);
     this.tokensContainer.removeEventListener('click', FilteredSearchManager.selectToken);
+    this.tokensContainer.removeEventListener('click', this.removeTokenWrapper);
     this.tokensContainer.removeEventListener('dblclick', this.editTokenWrapper);
     this.clearSearchButton.removeEventListener('click', this.onClearSearchWrapper);
     document.removeEventListener('click', gl.FilteredSearchVisualTokens.unselectTokens);
     document.removeEventListener('click', this.unselectEditTokensWrapper);
     document.removeEventListener('click', this.removeInputContainerFocusWrapper);
-    document.removeEventListener('keydown', this.removeSelectedTokenWrapper);
+    document.removeEventListener('keydown', this.removeSelectedTokenKeydownWrapper);
     eventHub.$off('recentSearchesItemSelected', this.onrecentSearchesItemSelectedWrapper);
   }
 
@@ -201,14 +204,28 @@ class FilteredSearchManager {
 
   static selectToken(e) {
     const button = e.target.closest('.selectable');
+    const removeButtonSelected = e.target.closest('.remove-token');
 
-    if (button) {
+    if (!removeButtonSelected && button) {
       e.preventDefault();
       e.stopPropagation();
       gl.FilteredSearchVisualTokens.selectToken(button);
     }
   }
 
+  removeToken(e) {
+    const removeButtonSelected = e.target.closest('.remove-token');
+
+    if (removeButtonSelected) {
+      e.preventDefault();
+      e.stopPropagation();
+
+      const button = e.target.closest('.selectable');
+      gl.FilteredSearchVisualTokens.selectToken(button, true);
+      this.removeSelectedToken();
+    }
+  }
+
   unselectEditTokens(e) {
     const inputContainer = this.container.querySelector('.filtered-search-box');
     const isElementInFilteredSearch = inputContainer && inputContainer.contains(e.target);
@@ -256,16 +273,21 @@ class FilteredSearchManager {
     }
   }
 
-  removeSelectedToken(e) {
+  removeSelectedTokenKeydown(e) {
     // 8 = Backspace Key
     // 46 = Delete Key
     if (e.keyCode === 8 || e.keyCode === 46) {
-      gl.FilteredSearchVisualTokens.removeSelectedToken();
-      this.handleInputPlaceholder();
-      this.toggleClearSearchButton();
+      this.removeSelectedToken();
     }
   }
 
+  removeSelectedToken() {
+    gl.FilteredSearchVisualTokens.removeSelectedToken();
+    this.handleInputPlaceholder();
+    this.toggleClearSearchButton();
+    this.dropdownManager.updateCurrentDropdownOffset();
+  }
+
   onClearSearch(e) {
     e.preventDefault();
     this.clearSearch();

app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js

@@ -16,11 +16,11 @@ class FilteredSearchVisualTokens {
     [].forEach.call(otherTokens, t => t.classList.remove('selected'));
   }
 
-  static selectToken(tokenButton) {
+  static selectToken(tokenButton, forceSelection = false) {
     const selected = tokenButton.classList.contains('selected');
     FilteredSearchVisualTokens.unselectTokens();
 
-    if (!selected) {
+    if (!selected || forceSelection) {
       tokenButton.classList.add('selected');
     }
   }
@@ -38,7 +38,12 @@ class FilteredSearchVisualTokens {
     return `
       <div class="selectable" role="button">
         <div class="name"></div>
-        <div class="value"></div>
+        <div class="value-container">
+          <div class="value"></div>
+          <div class="remove-token" role="button">
+            <i class="fa fa-close"></i>
+          </div>
+        </div>
       </div>
     `;
   }
@@ -122,7 +127,8 @@ class FilteredSearchVisualTokens {
 
       if (value) {
         const button = lastVisualToken.querySelector('.selectable');
-        button.removeChild(value);
+        const valueContainer = lastVisualToken.querySelector('.value-container');
+        button.removeChild(valueContainer);
         lastVisualToken.innerHTML = button.innerHTML;
       } else {
         lastVisualToken.closest('.tokens-container').removeChild(lastVisualToken);

app/assets/javascripts/gfm_auto_complete.js

@@ -3,6 +3,7 @@
 import emojiMap from 'emojis/digests.json';
 import emojiAliases from 'emojis/aliases.json';
 import { glEmojiTag } from '~/behaviors/gl_emoji';
+import glRegexp from '~/lib/utils/regexp';
 
 // Creates the variables for setting up GFM auto-completion
 window.gl = window.gl || {};
@@ -127,7 +128,15 @@ window.gl.GfmAutoComplete = {
       callbacks: {
         sorter: this.DefaultOptions.sorter,
         beforeInsert: this.DefaultOptions.beforeInsert,
-        filter: this.DefaultOptions.filter
+        filter: this.DefaultOptions.filter,
+
+        matcher: (flag, subtext) => {
+          const relevantText = subtext.trim().split(/\s/).pop();
+          const regexp = new RegExp(`(?:[^${glRegexp.unicodeLetters}0-9:]|\n|^):([^:]*)$`, 'gi');
+          const match = regexp.exec(relevantText);
+
+          return match && match.length ? match[1] : null;
+        }
       }
     });
     // Team Members

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

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

app/assets/javascripts/mini_pipeline_graph_dropdown.js

@@ -28,7 +28,9 @@ export default class MiniPipelineGraph {
    * All dropdown events are fired at the .dropdown-menu's parent element.
    */
   bindEvents() {
-    $(document).off('shown.bs.dropdown', this.container).on('shown.bs.dropdown', this.container, this.getBuildsList);
+    $(document)
+      .off('shown.bs.dropdown', this.container)
+      .on('shown.bs.dropdown', this.container, this.getBuildsList);
   }
 
   /**
@@ -91,6 +93,9 @@ export default class MiniPipelineGraph {
       },
       error: () => {
         this.toggleLoading(button);
+        if ($(button).parent().hasClass('open')) {
+          $(button).dropdown('toggle');
+        }
         new Flash('An error occurred while fetching the builds.', 'alert');
       },
     });

app/assets/javascripts/pipelines/components/stage.js

@@ -2,13 +2,6 @@
 import StatusIconEntityMap from '../../ci_status_icons';
 
 export default {
-  data() {
-    return {
-      builds: '',
-      spinner: '<span class="fa fa-spinner fa-spin"></span>',
-    };
-  },
-
   props: {
     stage: {
       type: Object,
@@ -16,6 +9,13 @@ export default {
     },
   },
 
+  data() {
+    return {
+      builds: '',
+      spinner: '<span class="fa fa-spinner fa-spin"></span>',
+    };
+  },
+
   updated() {
     if (this.builds) {
       this.stopDropdownClickPropagation();
@@ -31,7 +31,13 @@ export default {
       return this.$http.get(this.stage.dropdown_path)
         .then((response) => {
           this.builds = JSON.parse(response.body).html;
-        }, () => {
+        })
+        .catch(() => {
+          // If dropdown is opened we'll close it.
+          if (this.$el.classList.contains('open')) {
+            $(this.$refs.dropdown).dropdown('toggle');
+          }
+
           const flash = new Flash('Something went wrong on our end.');
           return flash;
         });
@@ -46,9 +52,10 @@ export default {
      * target the click event of this component.
      */
     stopDropdownClickPropagation() {
-      $(this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item')).on('click', (e) => {
-        e.stopPropagation();
-      });
+      $(this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item'))
+        .on('click', (e) => {
+          e.stopPropagation();
+        });
     },
   },
   computed: {
@@ -81,12 +88,22 @@ export default {
         data-placement="top"
         data-toggle="dropdown"
         type="button"
-        :aria-label="stage.title">
-        <span v-html="svgHTML" aria-hidden="true"></span>
-        <i class="fa fa-caret-down" aria-hidden="true"></i>
+        :aria-label="stage.title"
+        ref="dropdown">
+        <span
+          v-html="svgHTML"
+          aria-hidden="true">
+        </span>
+        <i
+          class="fa fa-caret-down"
+          aria-hidden="true" />
       </button>
-      <ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
-        <div class="arrow-up" aria-hidden="true"></div>
+      <ul
+        ref="dropdown-content"
+        class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
+        <div
+          class="arrow-up"
+          aria-hidden="true"></div>
         <div
           :class="dropdownClass"
           class="js-builds-dropdown-list scrollable-menu"

app/assets/javascripts/pipelines/components/time_ago.js

@@ -2,68 +2,95 @@ import iconTimerSvg from 'icons/_icon_timer.svg';
 import '../../lib/utils/datetime_utility';
 
 export default {
+  props: {
+    finishedTime: {
+      type: String,
+      required: true,
+    },
+
+    duration: {
+      type: Number,
+      required: true,
+    },
+  },
+
   data() {
     return {
-      currentTime: new Date(),
       iconTimerSvg,
     };
   },
-  props: ['pipeline'],
+
+  updated() {
+    $(this.$refs.tooltip).tooltip('fixTitle');
+  },
+
   computed: {
-    timeAgo() {
-      return gl.utils.getTimeago();
+    hasDuration() {
+      return this.duration > 0;
     },
-    localTimeFinished() {
-      return gl.utils.formatDate(this.pipeline.details.finished_at);
+
+    hasFinishedTime() {
+      return this.finishedTime !== '';
     },
-    timeStopped() {
-      const changeTime = this.currentTime;
-      const options = {
-        weekday: 'long',
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-      };
-      options.timeZoneName = 'short';
-      const finished = this.pipeline.details.finished_at;
-      if (!finished && changeTime) return false;
-      return ({ words: this.timeAgo.format(finished) });
+
+    localTimeFinished() {
+      return gl.utils.formatDate(this.finishedTime);
     },
-    duration() {
-      const { duration } = this.pipeline.details;
-      const date = new Date(duration * 1000);
+
+    durationFormated() {
+      const date = new Date(this.duration * 1000);
 
       let hh = date.getUTCHours();
       let mm = date.getUTCMinutes();
       let ss = date.getSeconds();
 
-      if (hh < 10) hh = `0${hh}`;
-      if (mm < 10) mm = `0${mm}`;
-      if (ss < 10) ss = `0${ss}`;
+      // left pad
+      if (hh < 10) {
+        hh = `0${hh}`;
+      }
+      if (mm < 10) {
+        mm = `0${mm}`;
+      }
+      if (ss < 10) {
+        ss = `0${ss}`;
+      }
 
-      if (duration !== null) return `${hh}:${mm}:${ss}`;
-      return false;
+      return `${hh}:${mm}:${ss}`;
     },
-  },
-  methods: {
-    changeTime() {
-      this.currentTime = new Date();
+
+    finishedTimeFormated() {
+      const timeAgo = gl.utils.getTimeago();
+
+      return timeAgo.format(this.finishedTime);
     },
   },
+
   template: `
     <td class="pipelines-time-ago">
-      <p class="duration" v-if='duration'>
-        <span v-html="iconTimerSvg"></span>
-        {{duration}}
+      <p
+        class="duration"
+        v-if="hasDuration">
+        <span
+          v-html="iconTimerSvg">
+        </span>
+        {{durationFormated}}
       </p>
-      <p class="finished-at" v-if='timeStopped'>
-        <i class="fa fa-calendar"></i>
+
+      <p
+        class="finished-at"
+        v-if="hasFinishedTime">
+
+        <i
+          class="fa fa-calendar"
+          aria-hidden="true" />
+
         <time
+          ref="tooltip"
           data-toggle="tooltip"
           data-placement="top"
           data-container="body"
-          :data-original-title='localTimeFinished'>
-          {{timeStopped.words}}
+          :title="localTimeFinished">
+          {{finishedTimeFormated}}
         </time>
       </p>
     </td>

app/assets/javascripts/pipelines/pipelines.js

-import Vue from 'vue';
 import Visibility from 'visibilityjs';
 import PipelinesService from './services/pipelines_service';
 import eventHub from './event_hub';
@@ -161,15 +160,6 @@ export default {
     eventHub.$on('refreshPipelines', this.fetchPipelines);
   },
 
-  beforeUpdate() {
-    if (this.state.pipelines.length &&
-        this.$children &&
-        !this.isMakingRequest &&
-        !this.isLoading) {
-      this.store.startTimeAgoLoops.call(this, Vue);
-    }
-  },
-
   beforeDestroyed() {
     eventHub.$off('refreshPipelines');
   },

app/assets/javascripts/pipelines/stores/pipelines_store.js

-/* eslint-disable no-underscore-dangle*/
-import VueRealtimeListener from '../../vue_realtime_listener';
-
 export default class PipelinesStore {
   constructor() {
     this.state = {};
@@ -30,32 +27,4 @@ export default class PipelinesStore {
 
     this.state.pageInfo = paginationInfo;
   }
-
-  /**
-   * FIXME: Move this inside the component.
-   *
-   * Once the data is received we will start the time ago loops.
-   *
-   * Everytime a request is made like retry or cancel a pipeline, every 10 seconds we
-   * update the time to show how long as passed.
-   *
-   */
-  startTimeAgoLoops() {
-    const startTimeLoops = () => {
-      this.timeLoopInterval = setInterval(() => {
-        this.$children[0].$children.reduce((acc, component) => {
-          const timeAgoComponent = component.$children.filter(el => el.$options._componentTag === 'time-ago')[0];
-          acc.push(timeAgoComponent);
-          return acc;
-        }, []).forEach(e => e.changeTime());
-      }, 10000);
-    };
-
-    startTimeLoops();
-
-    const removeIntervals = () => clearInterval(this.timeLoopInterval);
-    const startIntervals = () => startTimeLoops();
-
-    VueRealtimeListener(removeIntervals, startIntervals);
-  }
 }

app/assets/javascripts/vue_realtime_listener/index.js

-export default (removeIntervals, startIntervals) => {
-  window.removeEventListener('focus', startIntervals);
-  window.removeEventListener('blur', removeIntervals);
-  window.removeEventListener('onbeforeload', removeIntervals);
-
-  window.addEventListener('focus', startIntervals);
-  window.addEventListener('blur', removeIntervals);
-  window.addEventListener('onbeforeload', removeIntervals);
-};

app/assets/javascripts/vue_shared/components/pipelines_table_row.js

 /* eslint-disable no-param-reassign */
-
 import AsyncButtonComponent from '../../pipelines/components/async_button.vue';
 import PipelinesActionsComponent from '../../pipelines/components/pipelines_actions';
 import PipelinesArtifactsComponent from '../../pipelines/components/pipelines_artifacts';
@@ -166,6 +165,32 @@ export default {
       }
       return undefined;
     },
+
+    /**
+     * Timeago components expects a number
+     *
+     * @return {type}  description
+     */
+    pipelineDuration() {
+      if (this.pipeline.details && this.pipeline.details.duration) {
+        return this.pipeline.details.duration;
+      }
+
+      return 0;
+    },
+
+    /**
+     * Timeago component expects a String.
+     *
+     * @return {String}
+     */
+    pipelineFinishedAt() {
+      if (this.pipeline.details && this.pipeline.details.finished_at) {
+        return this.pipeline.details.finished_at;
+      }
+
+      return '';
+    },
   },
 
   template: `
@@ -192,7 +217,9 @@ export default {
         </div>
       </td>
 
-      <time-ago :pipeline="pipeline"/>
+      <time-ago
+        :duration="pipelineDuration"
+        :finished-time="pipelineFinishedAt" />
 
       <td class="pipeline-actions">
         <div class="pull-right btn-group">

app/assets/stylesheets/framework/dropdowns.scss

@@ -195,7 +195,6 @@
   border: 1px solid $dropdown-border-color;
   border-radius: $border-radius-base;
   box-shadow: 0 2px 4px $dropdown-shadow-color;
-  overflow: hidden;
   @include set-invisible;
 
   @media (max-width: $screen-sm-min) {

app/assets/stylesheets/framework/filters.scss

@@ -104,6 +104,24 @@
     padding: 2px 7px;
   }
 
+  .value {
+    padding-right: 0;
+  }
+
+  .remove-token {
+    display: inline-block;
+    padding-left: 4px;
+    padding-right: 8px;
+
+    .fa-close {
+      color: $gl-text-color-disabled;
+    }
+
+    &:hover .fa-close {
+      color: $gl-text-color-secondary;
+    }
+  }
+
   .name {
     background-color: $filter-name-resting-color;
     color: $filter-name-text-color;
@@ -112,7 +130,7 @@
     text-transform: capitalize;
   }
 
-  .value {
+  .value-container {
     background-color: $white-normal;
     color: $filter-value-text-color;
     border-radius: 0 2px 2px 0;
@@ -124,7 +142,7 @@
       background-color: $filter-name-selected-color;
     }
 
-    .value {
+    .value-container {
       background-color: $filter-value-selected-color;
     }
   }

app/assets/stylesheets/pages/projects.scss

@@ -622,6 +622,7 @@ pre.light-well {
 
   .controls {
     margin-left: auto;
+    text-align: right;
   }
 
   .ci-status-link {

app/assets/stylesheets/pages/tree.scss

@@ -160,7 +160,6 @@
 
 .tree-controls {
   float: right;
-  margin-top: 11px;
   position: relative;
   z-index: 2;
 

app/controllers/concerns/markdown_preview.rb

+module MarkdownPreview
+  private
+
+  def render_markdown_preview(text, markdown_context = {})
+    render json: {
+      body: view_context.markdown(text, markdown_context),
+      references: {
+        users: preview_referenced_users(text)
+      }
+    }
+  end
+
+  def preview_referenced_users(text)
+    extractor = Gitlab::ReferenceExtractor.new(@project, current_user)
+    extractor.analyze(text, author: current_user)
+
+    extractor.users.map(&:username)
+  end
+end

app/controllers/projects/wikis_controller.rb

 class Projects::WikisController < Projects::ApplicationController
+  include MarkdownPreview
+
   before_action :authorize_read_wiki!
   before_action :authorize_create_wiki!, only: [:edit, :create, :history]
   before_action :authorize_admin_wiki!, only: :destroy
@@ -97,21 +99,13 @@ class Projects::WikisController < Projects::ApplicationController
     )
   end
 
-  def preview_markdown
-    text = params[:text]
-
-    ext = Gitlab::ReferenceExtractor.new(@project, current_user)
-    ext.analyze(text, author: current_user)
-
-    render json: {
-      body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki, page_slug: params[:id]),
-      references: {
-        users: ext.users.map(&:username)
-      }
-    }
+  def git_access
   end
 
-  def git_access
+  def preview_markdown
+    context = { pipeline: :wiki, project_wiki: @project_wiki, page_slug: params[:id] }
+
+    render_markdown_preview(params[:text], context)
   end
 
   private
@@ -121,7 +115,6 @@ class Projects::WikisController < Projects::ApplicationController
 
     # Call #wiki to make sure the Wiki Repo is initialized
     @project_wiki.wiki
-
     @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages.first(15))
   rescue ProjectWiki::CouldNotCreateWikiError
     flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."

app/controllers/projects_controller.rb

 class ProjectsController < Projects::ApplicationController
   include IssuableCollections
   include ExtractsPath
+  include MarkdownPreview
 
   before_action :authenticate_user!, except: [:index, :show, :activity, :refs]
   before_action :project, except: [:index, :new, :create]
@@ -217,20 +218,6 @@ class ProjectsController < Projects::ApplicationController
     }
   end
 
-  def preview_markdown
-    text = params[:text]
-
-    ext = Gitlab::ReferenceExtractor.new(@project, current_user)
-    ext.analyze(text, author: current_user)
-
-    render json: {
-      body:       view_context.markdown(text),
-      references: {
-        users: ext.users.map(&:username)
-      }
-    }
-  end
-
   def refs
     branches = BranchesFinder.new(@repository, params).execute.map(&:name)
 
@@ -253,6 +240,10 @@ class ProjectsController < Projects::ApplicationController
     render json: options.to_json
   end
 
+  def preview_markdown
+    render_markdown_preview(params[:text])
+  end
+
   private
 
   # Render project landing depending of which features are available

app/controllers/snippets_controller.rb

@@ -2,6 +2,7 @@ class SnippetsController < ApplicationController
   include ToggleAwardEmoji
   include SpammableActions
   include SnippetsActions
+  include MarkdownPreview
 
   before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :download]
 
@@ -77,6 +78,10 @@ class SnippetsController < ApplicationController
     )
   end
 
+  def preview_markdown
+    render_markdown_preview(params[:text], skip_project_check: true)
+  end
+
   protected
 
   def snippet

app/helpers/application_helper.rb

@@ -199,38 +199,6 @@ module ApplicationHelper
     end
   end
 
-  def render_markup(file_name, file_content)
-    if gitlab_markdown?(file_name)
-      Hamlit::RailsHelpers.preserve(markdown(file_content))
-    elsif asciidoc?(file_name)
-      asciidoc(file_content)
-    elsif plain?(file_name)
-      content_tag :pre, class: 'plain-readme' do
-        file_content
-      end
-    else
-      other_markup(file_name, file_content)
-    end
-  rescue RuntimeError
-    simple_format(file_content)
-  end
-
-  def plain?(filename)
-    Gitlab::MarkupHelper.plain?(filename)
-  end
-
-  def markup?(filename)
-    Gitlab::MarkupHelper.markup?(filename)
-  end
-
-  def gitlab_markdown?(filename)
-    Gitlab::MarkupHelper.gitlab_markdown?(filename)
-  end
-
-  def asciidoc?(filename)
-    Gitlab::MarkupHelper.asciidoc?(filename)
-  end
-
   def promo_host
     'about.gitlab.com'
   end

app/helpers/gitlab_markdown_helper.rb → app/helpers/markup_helper.rb

 require 'nokogiri'
 
-module GitlabMarkdownHelper
+module MarkupHelper
+  def plain?(filename)
+    Gitlab::MarkupHelper.plain?(filename)
+  end
+
+  def markup?(filename)
+    Gitlab::MarkupHelper.markup?(filename)
+  end
+
+  def gitlab_markdown?(filename)
+    Gitlab::MarkupHelper.gitlab_markdown?(filename)
+  end
+
+  def asciidoc?(filename)
+    Gitlab::MarkupHelper.asciidoc?(filename)
+  end
+
   # Use this in places where you would normally use link_to(gfm(...), ...).
   #
   # It solves a problem occurring with nested links (i.e.
@@ -11,7 +27,7 @@ module GitlabMarkdownHelper
   # explicitly produce the correct linking behavior (i.e.
   # "<a>outer text </a><a>gfm ref</a><a> more outer text</a>").
   def link_to_gfm(body, url, html_options = {})
-    return "" if body.blank?
+    return '' if body.blank?
 
     context = {
       project: @project,
@@ -43,71 +59,73 @@ module GitlabMarkdownHelper
     fragment.to_html.html_safe
   end
 
+  # Return the first line of +text+, up to +max_chars+, after parsing the line
+  # as Markdown.  HTML tags in the parsed output are not counted toward the
+  # +max_chars+ limit.  If the length limit falls within a tag's contents, then
+  # the tag contents are truncated without removing the closing tag.
+  def first_line_in_markdown(text, max_chars = nil, options = {})
+    md = markdown(text, options).strip
+
+    truncate_visible(md, max_chars || md.length) if md.present?
+  end
+
   def markdown(text, context = {})
-    return "" unless text.present?
+    return '' unless text.present?
 
     context[:project] ||= @project
-
-    html = Banzai.render(text, context)
+    html = markdown_unsafe(text, context)
     banzai_postprocess(html, context)
   end
 
   def markdown_field(object, field)
     object = object.for_display if object.respond_to?(:for_display)
-    return "" unless object.present?
+    return '' unless object.present?
 
     html = Banzai.render_field(object, field)
     banzai_postprocess(html, object.banzai_render_context(field))
   end
 
-  def asciidoc(text)
-    Gitlab::Asciidoc.render(
-      text,
-      project:      @project,
-      current_user: (current_user if defined?(current_user)),
-
-      # RelativeLinkFilter
-      project_wiki:   @project_wiki,
-      requested_path: @path,
-      ref:            @ref,
-      commit:         @commit
-    )
+  def markup(file_name, text, context = {})
+    context[:project] ||= @project
+    html = context.delete(:rendered) || markup_unsafe(file_name, text, context)
+    banzai_postprocess(html, context)
   end
 
-  def other_markup(file_name, text)
-    Gitlab::OtherMarkup.render(
-      file_name,
-      text,
-      project:      @project,
-      current_user: (current_user if defined?(current_user)),
+  def render_wiki_content(wiki_page)
+    text = wiki_page.content
+    return '' unless text.present?
+
+    context = { pipeline: :wiki, project: @project, project_wiki: @project_wiki, page_slug: wiki_page.slug }
+
+    html =
+      case wiki_page.format
+      when :markdown
+        markdown_unsafe(text, context)
+      when :asciidoc
+        asciidoc_unsafe(text)
+      else
+        wiki_page.formatted_content.html_safe
+      end
 
-      # RelativeLinkFilter
-      project_wiki:   @project_wiki,
-      requested_path: @path,
-      ref:            @ref,
-      commit:         @commit
-    )
+    banzai_postprocess(html, context)
   end
 
-  # Return the first line of +text+, up to +max_chars+, after parsing the line
-  # as Markdown.  HTML tags in the parsed output are not counted toward the
-  # +max_chars+ limit.  If the length limit falls within a tag's contents, then
-  # the tag contents are truncated without removing the closing tag.
-  def first_line_in_markdown(text, max_chars = nil, options = {})
-    md = markdown(text, options).strip
+  def markup_unsafe(file_name, text, context = {})
+    return '' unless text.present?
 
-    truncate_visible(md, max_chars || md.length) if md.present?
-  end
-
-  def render_wiki_content(wiki_page)
-    case wiki_page.format
-    when :markdown
-      markdown(wiki_page.content, pipeline: :wiki, project_wiki: @project_wiki, page_slug: wiki_page.slug)
-    when :asciidoc
-      asciidoc(wiki_page.content)
+    if gitlab_markdown?(file_name)
+      Hamlit::RailsHelpers.preserve(markdown_unsafe(text, context))
+    elsif asciidoc?(file_name)
+      asciidoc_unsafe(text)
+    elsif plain?(file_name)
+      content_tag :pre, class: 'plain-readme' do
+        text
+      end
     else
-      wiki_page.formatted_content.html_safe
+      other_markup_unsafe(file_name, text)
     end
+  rescue RuntimeError
+    simple_format(text)
   end
 
   # Returns the text necessary to reference `entity` across projects
@@ -183,10 +201,10 @@ module GitlabMarkdownHelper
   end
 
   def markdown_toolbar_button(options = {})
-    data = options[:data].merge({ container: "body" })
+    data = options[:data].merge({ container: 'body' })
     content_tag :button,
-      type: "button",
-      class: "toolbar-btn js-md has-tooltip hidden-xs",
+      type: 'button',
+      class: 'toolbar-btn js-md has-tooltip hidden-xs',
       tabindex: -1,
       data: data,
       title: options[:title],
@@ -195,17 +213,34 @@ module GitlabMarkdownHelper
     end
   end
 
+  def markdown_unsafe(text, context = {})
+    Banzai.render(text, context)
+  end
+
+  def asciidoc_unsafe(text)
+    Gitlab::Asciidoc.render(text)
+  end
+
+  def other_markup_unsafe(file_name, text)
+    Gitlab::OtherMarkup.render(file_name, text)
+  end
+
   # Calls Banzai.post_process with some common context options
-  def banzai_postprocess(html, context)
+  def banzai_postprocess(html, context = {})
+    return '' unless html.present?
+
     context.merge!(
       current_user:   (current_user if defined?(current_user)),
 
       # RelativeLinkFilter
-      requested_path: @path,
+      commit:         @commit,
       project_wiki:   @project_wiki,
-      ref:            @ref
+      ref:            @ref,
+      requested_path: @path
     )
 
     Banzai.post_process(html, context)
   end
+
+  extend self
 end

app/helpers/projects_helper.rb

@@ -160,7 +160,7 @@ module ProjectsHelper
   end
 
   def project_list_cache_key(project)
-    key = [project.namespace.cache_key, project.cache_key, controller.controller_name, controller.action_name, current_application_settings.cache_key, 'v2.3']
+    key = [project.namespace.cache_key, project.cache_key, controller.controller_name, controller.action_name, current_application_settings.cache_key, 'v2.4']
     key << pipeline_status_cache_key(project.pipeline_status) if project.pipeline_status.has_status?
 
     key

app/helpers/services_helper.rb

@@ -13,8 +13,8 @@ module ServicesHelper
       "Event will be triggered when a confidential issue is created/updated/closed"
     when "merge_request", "merge_request_events"
       "Event will be triggered when a merge request is created/updated/merged"
-    when "build", "build_events"
-      "Event will be triggered when a build status changes"
+    when "pipeline", "pipeline_events"
+      "Event will be triggered when a pipeline status changes"
     when "wiki_page", "wiki_page_events"
       "Event will be triggered when a wiki page is created/updated"
     when "commit", "commit_events"

app/helpers/tree_helper.rb

@@ -12,10 +12,6 @@ module TreeHelper
     tree.html_safe
   end
 
-  def render_readme(readme)
-    render_markup(readme.name, readme.data)
-  end
-
   # Return an image icon depending on the file type and mode
   #
   # type - String type of the tree item; either 'folder' or 'file'

app/mailers/base_mailer.rb

 class BaseMailer < ActionMailer::Base
   helper ApplicationHelper
-  helper GitlabMarkdownHelper
+  helper MarkupHelper
 
   attr_accessor :current_user
   helper_method :current_user, :can?

app/models/event.rb

@@ -16,7 +16,7 @@ class Event < ActiveRecord::Base
 
   RESET_PROJECT_ACTIVITY_INTERVAL = 1.hour
 
-  delegate :name, :email, :public_email, to: :author, prefix: true, allow_nil: true
+  delegate :name, :email, :public_email, :username, to: :author, prefix: true, allow_nil: true
   delegate :title, to: :issue, prefix: true, allow_nil: true
   delegate :title, to: :merge_request, prefix: true, allow_nil: true
   delegate :title, to: :note, prefix: true, allow_nil: true

app/models/network/graph.rb

@@ -107,7 +107,8 @@ module Network
     def find_commits(skip = 0)
       opts = {
         max_count: self.class.max_count,
-        skip: skip
+        skip: skip,
+        order: :date
       }
 
       opts[:ref] = @commit.id if @filter_ref

app/models/repository.rb

@@ -24,9 +24,9 @@ class Repository
   # same name. The cache key used by those methods must also match method's
   # name.
   #
-  # For example, for entry `:readme` there's a method called `readme` which
-  # stores its data in the `readme` cache key.
-  CACHED_METHODS = %i(size commit_count readme contribution_guide
+  # For example, for entry `:commit_count` there's a method called `commit_count` which
+  # stores its data in the `commit_count` cache key.
+  CACHED_METHODS = %i(size commit_count rendered_readme contribution_guide
                       changelog license_blob license_key gitignore koding_yml
                       gitlab_ci_yml branch_names tag_names branch_count
                       tag_count avatar exists? empty? root_ref).freeze
@@ -35,7 +35,7 @@ class Repository
   # changed. This Hash maps file types (as returned by Gitlab::FileDetector) to
   # the corresponding methods to call for refreshing caches.
   METHOD_CACHES_FOR_FILE_TYPES = {
-    readme: :readme,
+    readme: :rendered_readme,
     changelog: :changelog,
     license: %i(license_blob license_key),
     contributing: :contribution_guide,
@@ -534,7 +534,11 @@ class Repository
       head.readme
     end
   end
-  cache_method :readme
+
+  def rendered_readme
+    MarkupHelper.markup_unsafe(readme.name, readme.data, project: project) if readme
+  end
+  cache_method :rendered_readme
 
   def contribution_guide
     file_on_head(:contributing)

app/models/service.rb

@@ -26,6 +26,7 @@ class Service < ActiveRecord::Base
   has_one :service_hook
 
   validates :project_id, presence: true, unless: proc { |service| service.template? }
+  validates :type, presence: true
 
   scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') }
   scope :issue_trackers, -> { where(category: 'issue_tracker') }

app/services/projects/create_service.rb

@@ -100,7 +100,8 @@ module Projects
       system_hook_service.execute_hooks_for(@project, :create)
 
       unless @project.group || @project.gitlab_project_import?
-        @project.team << [current_user, :master, current_user]
+        owners = [current_user, @project.namespace.owner].compact.uniq
+        @project.add_master(owners, current_user: current_user)
       end
 
       predefined_push_rule = PushRule.find_by(is_sample: true)

app/views/events/_event.atom.builder

@@ -8,6 +8,7 @@ xml.entry do
   xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
 
   xml.author do
+    xml.username event.author_username
     xml.name event.author_name
     xml.email event.author_public_email
   end

app/views/projects/_readme.html.haml

@@ -4,8 +4,7 @@
       - if can?(current_user, :push_code, @project)
         = link_to icon('pencil'), namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light edit-project-readme'
     .file-content.wiki
-      = cache(readme_cache_key) do
-        = render_readme(readme)
+      = markup(readme.name, readme.data, rendered: @repository.rendered_readme)
 - else
   .row-content-block.second-block.center
     %h3.page-title

app/views/projects/blob/_markup.html.haml

 - blob.load_all_data!(@repository)
 
 .file-content.wiki
-  = render_markup(blob.name, blob.data)
+  = markup(blob.name, blob.data)

app/views/projects/blob/preview.html.haml

 .diff-file
   .diff-content
-    - if gitlab_markdown?(@blob.name)
+    - if markup?(@blob.name)
       .file-content.wiki
-        = preserve do
-          = markdown(@content)
-    - elsif markup?(@blob.name)
-      .file-content.wiki
-        = raw render_markup(@blob.name, @content)
+        = markup(@blob.name, @content)
     - else
       .file-content.code.js-syntax-highlight
         - unless @diff_lines.empty?

app/views/projects/blob/viewers/_markup.html.haml

 - blob = viewer.blob
 .file-content.wiki
-  = render_markup(blob.name, blob.data)
+  = markup(blob.name, blob.data)

app/views/projects/boards/components/sidebar/_milestone.html.haml

@@ -22,7 +22,7 @@
           Milestone
           = icon("chevron-down")
         .dropdown-menu.dropdown-select.dropdown-menu-selectable
-          = dropdown_title("Assignee milestone")
+          = dropdown_title("Assign milestone")
           = dropdown_filter("Search milestones")
           = dropdown_content
           = dropdown_loading

app/views/projects/tree/_readme.html.haml

@@ -5,4 +5,4 @@
       %strong
         = readme.name
   .file-content.wiki
-    = render_readme(readme)
+    = markup(readme.name, readme.data)

app/views/projects/tree/_tree_header.html.haml

+.tree-controls
+  = render 'projects/find_file_link'
+  = render 'projects/buttons/download', project: @project, ref: @ref
+
 .tree-ref-holder
   = render 'shared/ref_switcher', destination: 'tree', path: @path
 

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

@@ -7,12 +7,4 @@
 = render 'projects/last_push'
 
 %div{ class: container_class }
-  .tree-controls
-    = render 'projects/find_file_link'
-    = render 'projects/buttons/download', project: @project, ref: @ref
-
-  #tree-holder.tree-holder.clearfix
-    .nav-block
-      = render 'projects/tree/tree_header', tree: @tree
-
-    = render 'projects/tree/tree_content', tree: @tree
+  = render 'projects/files'

app/views/search/results/_snippet_blob.html.haml

@@ -21,7 +21,7 @@
       .file-content.wiki
         - snippet_chunks.each do |chunk|
           - unless chunk[:data].empty?
-            = render_markup(snippet.file_name, chunk[:data])
+            = markup(snippet.file_name, chunk[:data])
           - else
             .file-content.code
               .nothing-here-block Empty file

app/views/shared/icons/_mr_bold.svg

-<svg width="15" height="20" viewBox="0 0 12 14" xmlns="http://www.w3.org/2000/svg"><path d="M1 4.967a2.15 2.15 0 1 1 2.3 0v5.066a2.15 2.15 0 1 1-2.3 0V4.967zm7.85 5.17V5.496c0-.745-.603-1.346-1.35-1.346V6l-3-3 3-3v1.85c2.016 0 3.65 1.63 3.65 3.646v4.45a2.15 2.15 0 1 1-2.3.191z" fill-rule="nonzero"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="m5 5.563v4.875c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-4.875c-1.024-.4-1.75-1.397-1.75-2.563 0-1.519 1.231-2.75 2.75-2.75 1.519 0 2.75 1.231 2.75 2.75 0 1.166-.726 2.162-1.75 2.563m-1 8.687c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25m0-10c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"/><path d="m10.501 2c1.381.001 2.499 1.125 2.499 2.506v5.931c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-5.931c0-.279-.225-.506-.499-.506v.926c0 .346-.244.474-.569.271l-2.952-1.844c-.314-.196-.325-.507 0-.71l2.952-1.844c.314-.196.569-.081.569.271v.93m1.499 12.25c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"/></svg>
+

app/views/shared/milestones/_sidebar.html.haml

@@ -106,7 +106,7 @@
       .sidebar-collapsed-icon
         %strong
           = icon('exclamation', 'aria-hidden': 'true')
-        %span= milestone.issues_visible_to_user(current_user).count
+        %span= milestone.merge_requests.count
       .title.hide-collapsed
         Merge requests
         %span.badge= milestone.merge_requests.count

app/views/shared/projects/_project.html.haml

@@ -7,6 +7,7 @@
 - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && project.commit
 - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description
 - cache_key = project_list_cache_key(project)
+- updated_tooltip = time_ago_with_tooltip(project.updated_at)
 
 %li.project-row{ class: css_class }
   = cache(cache_key) do
@@ -37,18 +38,21 @@
           = markdown_field(project, :description)
 
     .controls
-      - if project.archived
-        %span.prepend-left-10.label.label-warning archived
-      - if project.pipeline_status.has_status?
-        %span.prepend-left-10
-          = render_project_pipeline_status(project.pipeline_status)
-      - if forks
-        %span.prepend-left-10
-          = icon('code-fork')
-          = number_with_delimiter(project.forks_count)
-      - if stars
-        %span.prepend-left-10
-          = icon('star')
-          = number_with_delimiter(project.star_count)
-      %span.prepend-left-10.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) }
-        = visibility_level_icon(project.visibility_level, fw: true)
+      .prepend-top-0
+        - if project.archived
+          %span.prepend-left-10.label.label-warning archived
+        - if project.pipeline_status.has_status?
+          %span.prepend-left-10
+            = render_project_pipeline_status(project.pipeline_status)
+        - if forks
+          %span.prepend-left-10
+            = icon('code-fork')
+            = number_with_delimiter(project.forks_count)
+        - if stars
+          %span.prepend-left-10
+            = icon('star')
+            = number_with_delimiter(project.star_count)
+        %span.prepend-left-10.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) }
+          = visibility_level_icon(project.visibility_level, fw: true)
+      .prepend-top-5
+        updated #{updated_tooltip}

app/views/shared/snippets/_blob.html.haml

@@ -24,6 +24,6 @@
       - if gitlab_markdown?(@snippet.file_name)
         = preserve(markdown_field(@snippet, :content))
       - else
-        = render_markup(@snippet.file_name, @snippet.content)
+        = markup(@snippet.file_name, @snippet.content)
   - else
     = render 'shared/file_highlight', blob: @snippet

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

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

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/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/29505-allow-admins-sudo-to-blocked-users.yml

+---
+title: Allow admins to sudo to blocked users via the API
+merge_request: 10842
+author:

changelogs/unreleased/30466-click-x-to-remove-filter.yml

+---
+title: Add button to delete filters from filtered search bar
+merge_request:
+author:

changelogs/unreleased/30645-show-pipeline-events-description.yml

+---
+title: Fix pipeline events description for Slack and Mattermost integration
+merge_request: 10908
+author:

changelogs/unreleased/30973-fix-network-graph-ordering.yml

+---
+title: Fix ordering of commits in the network graph
+merge_request: 10936
+author:

changelogs/unreleased/31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized.yml

+---
+title: Fixed milestone sidebar showing incorrect number of MRs when collapsed
+merge_request: 10933
+author:

changelogs/unreleased/add-username-to-activity-feed.yml

+---
+title: Add username to activity atom feed
+merge_request: 10802
+author: winniehell

changelogs/unreleased/dm-sidekiq-5.yml

+---
+title: Bump Sidekiq to 5.0.0
+merge_request:
+author:

changelogs/unreleased/fix-notify-post-receive.yml

+---
+title: Fixed wrong method call on notify_post_receive
+merge_request:
+author: Luigi Leoni

changelogs/unreleased/fix_emoji_parser.yml

+---
+title: Fix rendering emoji inside a string
+merge_request: 10647
+author: blackst0ne

changelogs/unreleased/gl-version-backup-file.yml

+---
+title: Refactor backup/restore docs
+merge_request:
+author:

changelogs/unreleased/replace_header_mr_icon.yml

+---
+title: Replace header merge request icon
+merge_request: 10932
+author: blackst0ne

changelogs/unreleased/tc-make-user-master-project-by-admin.yml

+---
+title: Ensure namespace owner is Master of project upon creation
+merge_request: 10910
+author:

changelogs/unreleased/zj-dockerfiles.yml

+---
+title: Dockerfiles templates are imported from gitlab.com/gitlab-org/Dockerfile
+merge_request: 10663
+author:

config/routes/snippets.rb

@@ -3,6 +3,7 @@ resources :snippets, concerns: :awardable do
     get 'raw'
     get 'download'
     post :mark_as_spam
+    post :preview_markdown
   end
 end
 

db/migrate/20170421102337_remove_nil_type_services.rb

+class RemoveNilTypeServices < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def up
+    execute <<-SQL
+      DELETE FROM services WHERE type IS NULL OR type = '';
+    SQL
+  end
+
+  def down
+  end
+end

doc/README.md

 # GitLab Enterprise Edition
 
-[GitLab](https://about.gitlab.com/) is a Git-based fully featured platform for software development.
+[GitLab](https://about.gitlab.com/) is a Git-based fully featured platform
+for software development.
 
-**[GitLab Enterprise Edition (EE)](https://about.gitlab.com/gitlab-ee/)** is an opencore product, self-hosted, available under distinct [subscriptions](https://about.gitlab.com/products/).
+**GitLab Enterprise Edition (EE)** is an opencore product, self-hosted,
+available under distinct [subscriptions](https://about.gitlab.com/products/).
 
-GitLab EE contains all the features available in [GitLab Community Edition (CE)](https://docs.gitlab.com/ce/), plus premium features available in each version: **Enterprise Edition Starter** (**EES**) and **Enterprise Edition Premium** (**EEP**). Everything available in **EES** is also available in **EEP**.
+GitLab EE contains all the features available in
+[GitLab Community Edition (CE)](https://docs.gitlab.com/ce/),
+plus premium features available in each version: **Enterprise Edition Starter**
+(**EES**) and **Enterprise Edition Premium** (**EEP**). Everything available in
+**EES** is also available in **EEP**.
 
 ----
 
@@ -22,7 +28,7 @@ Shortcuts to GitLab's most visited docs:
 - [GitLab Workflow](workflow/README.md): Enhance your workflow with the best of GitLab Workflow.
   - See also [GitLab Workflow - an overview](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/).
 - [GitLab Markdown](user/markdown.md): GitLab's advanced formatting system (GitLab Flavored Markdown).
-- [GitLab Slash Commands](user/project/slash_commands.md): Textual shortcuts for common actions on issues or merge requests that are usually done by clicking buttons or dropdowns in GitLab's UI
+- [GitLab Slash Commands](user/project/slash_commands.md): Textual shortcuts for common actions on issues or merge requests that are usually done by clicking buttons or dropdowns in GitLab's UI.
 
 ### User account
 
@@ -69,7 +75,7 @@ Manage files and branches from the UI (user interface):
 - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests.
 - [Labels](user/project/labels.md): Categorize your issues or merge requests based on descriptive titles.
 - [Merge Requests](user/project/merge_requests/index.md)
-  - [WIP Merge Requests](user/project/merge_requests/work_in_progress_merge_requests.md)
+  - [Work In Progress Merge Requests](user/project/merge_requests/work_in_progress_merge_requests.md)
   - [Merge Request discussion resolution](user/discussions/index.md#moving-a-single-discussion-to-a-new-issue): Resolve discussions, move discussions in a merge request to an issue, only allow merge requests to be merged if all discussions are resolved.
   - **(EES/EEP)** [Merge Request approval](user/project/merge_requests/merge_request_approvals.md): Make sure every merge request is approved by one or more people before getting merged.
   - [Checkout merge requests locally](user/project/merge_requests/index.md#checkout-merge-requests-locally)
@@ -118,7 +124,7 @@ Take a step ahead and dive into GitLab's advanced features.
 ### Integrations
 
 - [Project Services](user/project/integrations/project_services.md): Integrate a project with external services, such as CI and chat.
-- [GitLab Integrations](integration/README.md): Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication.
+- [GitLab Integration](integration/README.md): Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication.
 
 ----
 
@@ -145,12 +151,12 @@ have access to GitLab administration tools and settings.
 
 ### GitLab admins' superpowers
 
-- [Container Registry](administration/container_registry.md): Configure Container Registry with GitLab.
+- [Container Registry](administration/container_registry.md): Configure Docker Registry with GitLab.
 - [Custom Git hooks](administration/custom_hooks.md): Custom Git hooks (on the filesystem) for when webhooks aren't enough.
-- [Git LFS configuration](workflow/lfs/lfs_administration.md): Enable/disable Git LFS, change the location of LFS object storage.
+- [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab.
 - [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages.
 - [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability.
-- [User cohorts](user/admin_area/user_cohorts.md): View user activity over time.
+- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
 - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
 - **(EES/EEP)** [Audit logs and events](administration/audit_events.md): View the changes made within the GitLab server.
 - **(EES/EEP)** [Elasticsearch](integration/elasticsearch.md): A flexible, scalable and powerful search service to keep GitLab's search fast when dealing with huge amount of data.
@@ -163,7 +169,7 @@ have access to GitLab administration tools and settings.
 - **(EES/EEP)** [Omnibus support for external MySQL DB](https://docs.gitlab.com/omnibus/settings/database.html#using-a-mysql-database-management-server-enterprise-edition-only): Omnibus package supports configuring an external MySQL database.
 - **(EES/EEP)** [Omnibus support for log forwarding](https://docs.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only)
 - GitLab CI
-    - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration.
+    - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time.
 
 ### Integrations
 
@@ -172,6 +178,7 @@ have access to GitLab administration tools and settings.
 - [Mattermost](user/project/integrations/mattermost.md): Set up GitLab with Mattermost.
 - **(EES/EEP)** [Jenkins](integration/jenkins.md): Set up GitLab with Jenkins.
 
+
 ### Monitoring
 
 - [GitLab performance monitoring with InfluxDB](administration/monitoring/performance/introduction.md): Configure GitLab and InfluxDB for measuring performance metrics.
@@ -182,7 +189,7 @@ have access to GitLab administration tools and settings.
 
 - [Housekeeping](administration/housekeeping.md): Keep your Git repository tidy and fast.
 - [Operations](administration/operations.md): Keeping GitLab up and running.
-- [Polling](administration/polling.md): Configure how often the GitLab UI polls for updates
+- [Polling](administration/polling.md): Configure how often the GitLab UI polls for updates.
 - [Request Profiling](administration/monitoring/performance/request_profiling.md): Get a detailed profile on slow requests.
 
 ### Customization

doc/administration/high_availability/load_balancer.md

@@ -18,7 +18,8 @@ you need to use with GitLab.
 
 ## GitLab Pages Ports
 
-If you're using GitLab Pages you will need some additional port configurations.
+If you're using GitLab Pages with custom domain support you will need some 
+additional port configurations.
 GitLab Pages requires a separate virtual IP address. Configure DNS to point the
 `pages_external_url` from `/etc/gitlab/gitlab.rb` at the new virtual IP address. See the
 [GitLab Pages documentation][gitlab-pages] for more information.

doc/administration/high_availability/nfs.md

@@ -7,21 +7,20 @@ supported natively in NFS version 4. NFSv3 also supports locking as long as
 Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not
 specifically test NFSv3.
 
-**no_root_squash**: NFS normally changes the `root` user to `nobody`. This is
-a good security measure when NFS shares will be accessed by many different
-users. However, in this case only GitLab will use the NFS share so it
-is safe. GitLab requires the `no_root_squash` setting because we need to
-manage file permissions automatically. Without the setting you will receive
-errors when the Omnibus package tries to alter permissions. Note that GitLab
-and other bundled components do **not** run as `root` but as non-privileged
-users. The requirement for `no_root_squash` is to allow the Omnibus package to
-set ownership and permissions on files, as needed.
-
 ### Recommended options
 
 When you define your NFS exports, we recommend you also add the following
 options:
 
+- `no_root_squash` - NFS normally changes the `root` user to `nobody`. This is
+  a good security measure when NFS shares will be accessed by many different
+  users. However, in this case only GitLab will use the NFS share so it
+  is safe. GitLab recommends the `no_root_squash` setting because we need to
+  manage file permissions automatically. Without the setting you may receive
+  errors when the Omnibus package tries to alter permissions. Note that GitLab
+  and other bundled components do **not** run as `root` but as non-privileged
+  users. The recommendation for `no_root_squash` is to allow the Omnibus package
+  to set ownership and permissions on files, as needed.
 - `sync` - Force synchronous behavior. Default is asynchronous and under certain
   circumstances it could lead to data loss if a failure occurs before data has
   synced.

doc/development/testing.md

@@ -202,6 +202,7 @@ Please consult the [dedicated "Frontend testing" guide](./fe_guide/testing.md).
 - Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines
   to separate phases.
 - Try to use `Gitlab.config.gitlab.host` rather than hard coding `'localhost'`
+- On `before` and `after` hooks, prefer it scoped to `:context` over `:all`
 
 [four-phase-test]: https://robots.thoughtbot.com/four-phase-test
 
@@ -225,6 +226,20 @@ so we need to set some guidelines for their use going forward:
 
 [lets-not]: https://robots.thoughtbot.com/lets-not
 
+#### `set` variables
+
+In some cases there is no need to recreate the same object for tests again for
+each example. For example, a project is needed to test issues on the same
+project, one project will do for the entire file. This can be achieved by using
+`set` in the same way you would use `let`.
+
+`rspec-set` only works on ActiveRecord objects, and before new examples it
+reloads or recreates the model, _only_ if needed. That is, when you changed
+properties or destroyed the object.
+
+There is one gotcha; you can't reference a model defined in a `let` block in a
+`set` block.
+
 ### Time-sensitive tests
 
 [Timecop](https://github.com/travisjeffery/timecop) is available in our

doc/user/admin_area/settings/usage_statistics.md

@@ -3,7 +3,7 @@
 GitLab Inc. will periodically collect information about your instance in order
 to perform various actions.
 
-All statistics are opt-in and you can always disable them from the admin panel.
+All statistics are opt-out, you can disable them from the admin panel.
 
 ## Version check
 

doc/user/project/integrations/bamboo.md

@@ -51,9 +51,9 @@ service in GitLab.
 
 ## Troubleshooting
 
-If builds are not triggered, these are a couple of things to keep in mind.
+If builds are not triggered, ensure you entered the right GitLab IP address in
+Bamboo under 'Trigger IP addresses'.
+
+>**Note:**
+- Starting with GitLab 8.14.0, builds are triggered on push events.
 
-1. Ensure you entered the right GitLab IP address in Bamboo under 'Trigger
-   IP addresses'.
-1. Remember that GitLab only triggers builds on push events. A commit via the
-   web interface will not trigger CI currently.

lib/api/helpers.rb

@@ -104,7 +104,7 @@ module API
     end
 
     def authenticate!
-      unauthorized! unless current_user && can?(current_user, :access_api)
+      unauthorized! unless current_user && can?(initial_current_user, :access_api)
     end
 
     def authenticate_non_get!

lib/api/internal.rb

@@ -152,7 +152,7 @@ module API
         begin
           Gitlab::GitalyClient::Notifications.new(project.repository).post_receive
         rescue GRPC::Unavailable => e
-          render_api_error(e, 500)
+          render_api_error!(e, 500)
         end
       end
     end

lib/backup/manager.rb

@@ -15,7 +15,7 @@ module Backup
       s[:gitlab_version]     = Gitlab::VERSION
       s[:tar_version]        = tar_version
       s[:skipped]            = ENV["SKIP"]
-      tar_file = "#{s[:backup_created_at].strftime('%s_%Y_%m_%d')}#{FILE_NAME_SUFFIX}"
+      tar_file = "#{s[:backup_created_at].strftime('%s_%Y_%m_%d_')}#{s[:gitlab_version]}#{FILE_NAME_SUFFIX}"
 
       Dir.chdir(backup_path) do
         File.open("#{backup_path}/backup_information.yml", "w+") do |file|

lib/banzai/filter/emoji_filter.rb

@@ -53,7 +53,10 @@ module Banzai
 
       # Build a regexp that matches all valid :emoji: names.
       def self.emoji_pattern
-        @emoji_pattern ||= /:(#{Gitlab::Emoji.emojis_names.map { |name| Regexp.escape(name) }.join('|')}):/
+        @emoji_pattern ||=
+          /(?<=[^[:alnum:]:]|\n|^)
+          :(#{Gitlab::Emoji.emojis_names.map { |name| Regexp.escape(name) }.join('|')}):
+          (?=[^[:alnum:]:]|$)/x
       end
 
       # Build a regexp that matches all valid unicode emojis names.

lib/gitlab/asciidoc.rb

@@ -14,28 +14,16 @@ module Gitlab
     # Public: Converts the provided Asciidoc markup into HTML.
     #
     # input         - the source text in Asciidoc format
-    # context       - a Hash with the template context:
-    #                 :commit
-    #                 :project
-    #                 :project_wiki
-    #                 :requested_path
-    #                 :ref
-    # asciidoc_opts - a Hash of options to pass to the Asciidoctor converter
     #
-    def self.render(input, context, asciidoc_opts = {})
-      asciidoc_opts.reverse_merge!(
-        safe: :secure,
-        backend: :gitlab_html5,
-        attributes: []
-      )
-      asciidoc_opts[:attributes].unshift(*DEFAULT_ADOC_ATTRS)
+    def self.render(input)
+      asciidoc_opts = { safe: :secure,
+                        backend: :gitlab_html5,
+                        attributes: DEFAULT_ADOC_ATTRS }
 
       plantuml_setup
 
       html = ::Asciidoctor.convert(input, asciidoc_opts)
 
-      html = Banzai.post_process(html, context)
-
       filter = Banzai::Filter::SanitizationFilter.new(html)
       html = filter.call.to_s
 

lib/gitlab/git/repository.rb

@@ -494,7 +494,9 @@ module Gitlab
       #     :contains is the commit contained by the refs from which to begin (SHA1 or name)
       #     :max_count is the maximum number of commits to fetch
       #     :skip is the number of commits to skip
-      #     :order is the commits order and allowed value is :date(default) or :topo
+      #     :order is the commits order and allowed value is :none (default), :date, or :topo
+      #        commit ordering types are documented here:
+      #        http://www.rubydoc.info/github/libgit2/rugged/Rugged#SORT_NONE-constant)
       #
       def find_commits(options = {})
         actual_options = options.dup
@@ -522,11 +524,8 @@ module Gitlab
           end
         end
 
-        if actual_options[:order] == :topo
-          walker.sorting(Rugged::SORT_TOPO)
-        else
-          walker.sorting(Rugged::SORT_NONE)
-        end
+        sort_type = rugged_sort_type(actual_options[:order])
+        walker.sorting(sort_type)
 
         commits = []
         offset = actual_options[:skip]
@@ -1273,6 +1272,18 @@ module Gitlab
       def gitaly_ref_client
         @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
       end
+
+      # Returns the `Rugged` sorting type constant for a given
+      # sort type key. Valid keys are `:none`, `:topo`, and `:date`
+      def rugged_sort_type(key)
+        @rugged_sort_types ||= {
+          none: Rugged::SORT_NONE,
+          topo: Rugged::SORT_TOPO,
+          date: Rugged::SORT_DATE
+        }
+
+        @rugged_sort_types.fetch(key, Rugged::SORT_NONE)
+      end
     end
   end
 end

lib/gitlab/other_markup.rb

@@ -4,19 +4,11 @@ module Gitlab
     # Public: Converts the provided markup into HTML.
     #
     # input         - the source text in a markup format
-    # context       - a Hash with the template context:
-    #                 :commit
-    #                 :project
-    #                 :project_wiki
-    #                 :requested_path
-    #                 :ref
     #
-    def self.render(file_name, input, context)
+    def self.render(file_name, input)
       html = GitHub::Markup.render(file_name, input).
         force_encoding(input.encoding)
 
-      html = Banzai.post_process(html, context)
-
       filter = Banzai::Filter::SanitizationFilter.new(html)
       html = filter.call.to_s
 

lib/gitlab/template/dockerfile_template.rb

@@ -8,7 +8,7 @@ module Gitlab
 
       class << self
         def extension
-          'Dockerfile'
+          '.Dockerfile'
         end
 
         def categories
@@ -18,7 +18,7 @@ module Gitlab
         end
 
         def base_dir
-          Rails.root.join('vendor/dockerfile')
+          Rails.root.join('vendor/Dockerfile')
         end
 
         def finder(project = nil)

lib/tasks/gitlab/update_templates.rake

@@ -5,7 +5,7 @@ namespace :gitlab do
   end
 
   def update(template)
-    sub_dir = template.repo_url.match(/([a-z-]+)\.git\z/)[1]
+    sub_dir = template.repo_url.match(/([A-Za-z-]+)\.git\z/)[1]
     dir = File.join(vendor_directory, sub_dir)
 
     unless clone_repository(template.repo_url, dir)
@@ -45,7 +45,11 @@ namespace :gitlab do
     Template.new(
       "https://gitlab.com/gitlab-org/gitlab-ci-yml.git",
       /(\.{1,2}|LICENSE|CONTRIBUTING.md|Pages|autodeploy|\.gitlab-ci.yml)\z/
-    )
+    ),
+    Template.new(
+      "https://gitlab.com/gitlab-org/Dockerfile.git",
+      /(\.{1,2}|LICENSE|CONTRIBUTING.md|\.Dockerfile)\z/
+    ),
   ].freeze
 
   def vendor_directory

spec/controllers/projects/wikis_controller_spec.rb

+require 'spec_helper'
+
+describe Projects::WikisController do
+  let(:project) { create(:project_empty_repo, :public) }
+  let(:user) { create(:user) }
+
+  describe 'POST #preview_markdown' do
+    it 'renders json in a correct format' do
+      sign_in(user)
+
+      post :preview_markdown, namespace_id: project.namespace, project_id: project, id: 'page/path', text: '*Markdown* text'
+
+      expect(JSON.parse(response.body).keys).to match_array(%w(body references))
+    end
+  end
+end

spec/controllers/projects_controller_spec.rb

@@ -441,4 +441,14 @@ describe ProjectsController do
       expect(response).to have_http_status(200)
     end
   end
+
+  describe 'POST #preview_markdown' do
+    it 'renders json in a correct format' do
+      sign_in(user)
+
+      post :preview_markdown, namespace_id: public_project.namespace, id: public_project, text: '*Markdown* text'
+
+      expect(JSON.parse(response.body).keys).to match_array(%w(body references))
+    end
+  end
 end

spec/controllers/snippets_controller_spec.rb

@@ -521,4 +521,16 @@ describe SnippetsController do
       end
     end
   end
+
+  describe 'POST #preview_markdown' do
+    let(:snippet) { create(:personal_snippet, :public) }
+
+    it 'renders json in a correct format' do
+      sign_in(user)
+
+      post :preview_markdown, id: snippet, text: '*Markdown* text'
+
+      expect(JSON.parse(response.body).keys).to match_array(%w(body references))
+    end
+  end
 end

spec/factories/services.rb

 FactoryGirl.define do
   factory :service do
     project factory: :empty_project
+    type 'Service'
+  end
+
+  factory :custom_issue_tracker_service, class: CustomIssueTrackerService do
+    project factory: :empty_project
+    type 'CustomIssueTrackerService'
+    category 'issue_tracker'
+    active true
+    properties(
+      project_url: 'https://project.url.com',
+      issues_url: 'https://issues.url.com',
+      new_issue_url: 'https://newissue.url.com'
+    )
   end
 
   factory :kubernetes_service do

spec/features/admin/admin_cohorts_spec.rb

+require 'rails_helper'
+
+feature 'Admin cohorts page', feature: true do
+  before do
+    login_as :admin
+  end
+
+  scenario 'See users count per month' do
+    2.times { create(:user) }
+
+    visit admin_cohorts_path
+
+    expect(page).to have_content("#{Time.now.strftime('%b %Y')} 3 0")
+  end
+end

spec/features/copy_as_gfm_spec.rb

 require 'spec_helper'
 
 describe 'Copy as GFM', feature: true, js: true do
-  include GitlabMarkdownHelper
+  include MarkupHelper
   include RepoHelpers
   include ActionView::Helpers::JavaScriptHelper
 

spec/features/issues/filtered_search/filter_issues_spec.rb

@@ -12,7 +12,7 @@ describe 'Filter issues', js: true, feature: true do
   let!(:wontfix) { create(:label, project: project, title: "Won't fix") }
 
   let!(:bug_label) { create(:label, project: project, title: 'bug') }
-  let!(:caps_sensitive_label) { create(:label, project: project, title: 'CAPS_sensitive') }
+  let!(:caps_sensitive_label) { create(:label, project: project, title: 'CaPs') }
   let!(:milestone) { create(:milestone, title: "8", project: project, start_date: 2.days.ago) }
   let!(:multiple_words_label) { create(:label, project: project, title: "Two words") }
 

spec/features/issues/gfm_autocomplete_spec.rb

@@ -45,6 +45,33 @@ feature 'GFM autocomplete', feature: true, js: true do
     expect(find('#at-view-58')).not_to have_selector('.cur:first-of-type')
   end
 
+  it 'does not open autocomplete menu when ":" is prefixed by a number and letters' do
+    note = find('#note_note')
+
+    # Number.
+    page.within '.timeline-content-form' do
+      note.native.send_keys('7:')
+    end
+
+    expect(page).not_to have_selector('.atwho-view')
+
+    # ASCII letter.
+    page.within '.timeline-content-form' do
+      note.set('')
+      note.native.send_keys('w:')
+    end
+
+    expect(page).not_to have_selector('.atwho-view')
+
+    # Non-ASCII letter.
+    page.within '.timeline-content-form' do
+      note.set('')
+      note.native.send_keys('Ё:')
+    end
+
+    expect(page).not_to have_selector('.atwho-view')
+  end
+
   it 'selects the first item for assignee dropdowns' do
     page.within '.timeline-content-form' do
       find('#note_note').native.send_keys('')

spec/features/markdown_spec.rb

@@ -26,7 +26,7 @@ require 'erb'
 
 describe 'GitLab Markdown', feature: true do
   include Capybara::Node::Matchers
-  include GitlabMarkdownHelper
+  include MarkupHelper
   include MarkdownMatchers
 
   # Sometimes it can be useful to see the parsed output of the Markdown document

spec/features/projects/files/dockerfile_dropdown_spec.rb

 require 'spec_helper'
+require 'fileutils'
 
 feature 'User wants to add a Dockerfile file', feature: true do
   before do
     user = create(:user)
     project = create(:project)
     project.team << [user, :master]
+
     login_as user
+
     visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'Dockerfile')
   end
 
@@ -15,11 +18,14 @@ feature 'User wants to add a Dockerfile file', feature: true do
 
   scenario 'user can pick a Dockerfile file from the dropdown', js: true do
     find('.js-dockerfile-selector').click
+
     wait_for_ajax
+
     within '.dockerfile-selector' do
       find('.dropdown-input-field').set('HTTPd')
       find('.dropdown-content li', text: 'HTTPd').click
     end
+
     wait_for_ajax
 
     expect(page).to have_css('.dockerfile-selector .dropdown-toggle-text', text: 'HTTPd')

spec/features/projects/files/find_files_spec.rb

+require 'spec_helper'
+
+feature 'Find files button in the tree header', feature: true do
+  given(:user) { create(:user) }
+  given(:project) { create(:project) }
+
+  background do
+    login_as(user)
+    project.team << [user, :developer]
+  end
+
+  scenario 'project main screen' do
+    visit namespace_project_path(
+      project.namespace,
+      project
+    )
+
+    expect(page).to have_selector('.tree-controls .shortcuts-find-file')
+  end
+
+  scenario 'project tree screen' do
+    visit namespace_project_tree_path(
+      project.namespace,
+      project,
+      project.default_branch
+    )
+
+    expect(page).to have_selector('.tree-controls .shortcuts-find-file')
+  end
+end

spec/features/projects/milestones/milestone_spec.rb

@@ -93,4 +93,28 @@ feature 'Project milestone', :feature do
   def milestone_path
     namespace_project_milestone_path(project.namespace, project, milestone)
   end
+
+  context 'when project has an issue' do
+    before do
+      create(:issue, project: project, milestone: milestone)
+
+      visit namespace_project_milestone_path(project.namespace, project, milestone)
+    end
+
+    describe 'the collapsed sidebar' do
+      before do
+        find('.milestone-sidebar .gutter-toggle').click
+      end
+
+      it 'shows the total MR and issue counts' do
+        find('.milestone-sidebar .block', match: :first)
+        blocks = all('.milestone-sidebar .block')
+
+        aggregate_failures 'MR and issue blocks' do
+          expect(blocks[3]).to have_content 1
+          expect(blocks[5]).to have_content 0
+        end
+      end
+    end
+  end
 end

spec/finders/issues_finder_spec.rb

 require 'spec_helper'
 
 describe IssuesFinder do
-  let(:user) { create(:user) }
-  let(:user2) { create(:user) }
-  let(:project1) { create(:empty_project) }
-  let(:project2) { create(:empty_project) }
-  let(:milestone) { create(:milestone, project: project1) }
-  let(:label) { create(:label, project: project2) }
-  let(:issue1) { create(:issue, author: user, assignee: user, project: project1, milestone: milestone, title: 'gitlab') }
-  let(:issue2) { create(:issue, author: user, assignee: user, project: project2, description: 'gitlab') }
-  let(:issue3) { create(:issue, author: user2, assignee: user2, project: project2, title: 'tanuki', description: 'tanuki') }
+  set(:user) { create(:user) }
+  set(:user2) { create(:user) }
+  set(:project1) { create(:empty_project) }
+  set(:project2) { create(:empty_project) }
+  set(:milestone) { create(:milestone, project: project1) }
+  set(:label) { create(:label, project: project2) }
+  set(:issue1) { create(:issue, author: user, assignee: user, project: project1, milestone: milestone, title: 'gitlab') }
+  set(:issue2) { create(:issue, author: user, assignee: user, project: project2, description: 'gitlab') }
+  set(:issue3) { create(:issue, author: user2, assignee: user2, project: project2, title: 'tanuki', description: 'tanuki') }
 
   describe '#execute' do
-    let(:closed_issue) { create(:issue, author: user2, assignee: user2, project: project2, state: 'closed') }
-    let!(:label_link) { create(:label_link, label: label, target: issue2) }
+    set(:closed_issue) { create(:issue, author: user2, assignee: user2, project: project2, state: 'closed') }
+    set(:label_link) { create(:label_link, label: label, target: issue2) }
     let(:search_user) { user }
     let(:params) { {} }
     let(:issues) { IssuesFinder.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
 
-    before do
+    before(:context) do
       project1.team << [user, :master]
       project2.team << [user, :developer]
       project2.team << [user2, :developer]

spec/fixtures/markdown.md.erb

@@ -116,7 +116,7 @@ Linking to a file relative to this project's repository should work.
 
 Because life would be :zzz: without Emoji, right? :rocket:
 
-Get ready for the Emoji :bomb:: :+1::-1::ok_hand::wave::v::raised_hand::muscle:
+Get ready for the Emoji :bomb: : :+1: :-1: :ok_hand: :wave: :v: :raised_hand: :muscle:
 
 ### TableOfContentsFilter
 

spec/helpers/application_helper_spec.rb

@@ -239,33 +239,6 @@ describe ApplicationHelper do
     end
   end
 
-  describe 'render_markup' do
-    let(:content) { 'Noël' }
-    let(:user) { create(:user) }
-    before do
-      allow(helper).to receive(:current_user).and_return(user)
-    end
-
-    it 'preserves encoding' do
-      expect(content.encoding.name).to eq('UTF-8')
-      expect(helper.render_markup('foo.rst', content).encoding.name).to eq('UTF-8')
-    end
-
-    it "delegates to #markdown when file name corresponds to Markdown" do
-      expect(helper).to receive(:gitlab_markdown?).with('foo.md').and_return(true)
-      expect(helper).to receive(:markdown).and_return('NOEL')
-
-      expect(helper.render_markup('foo.md', content)).to eq('NOEL')
-    end
-
-    it "delegates to #asciidoc when file name corresponds to AsciiDoc" do
-      expect(helper).to receive(:asciidoc?).with('foo.adoc').and_return(true)
-      expect(helper).to receive(:asciidoc).and_return('NOEL')
-
-      expect(helper.render_markup('foo.adoc', content)).to eq('NOEL')
-    end
-  end
-
   describe '#active_when' do
     it { expect(helper.active_when(true)).to eq('active') }
     it { expect(helper.active_when(false)).to eq(nil) }