Merge branch 'ce_upstream' into 'master'

CE upstream Closes #3794, #3781, gitaly#638, and gitlab-ce#38923 See merge request gitlab-org/gitlab-ee!3199

Merge branch 'ce_upstream' into 'master'
CE upstream Closes #3794, #3781, gitaly#638, and gitlab-ce#38923 See merge request gitlab-org/gitlab-ee!3199
822d5612 · Grzegorz Bizon · a5db2157 · c667e7fd · 822d5612 · 822d5612
Commit 822d5612 authored Oct 27, 2017 by Grzegorz Bizon
171 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,11 +52,11 @@ stages:
    - gitlab-org

 .tests-metadata-state: &tests-metadata-state
-  services: []
+  <<: *dedicated-runner
  variables:
-    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "false"
    TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache"
+  before_script:
+    - source scripts/utils.sh
  artifacts:
    expire_in: 31d
    paths:
@@ -92,6 +92,7 @@ stages:
 .rspec-metadata: &rspec-metadata
  <<: *dedicated-runner
  <<: *pull-cache
+  <<: *except-docs
  stage: test
  script:
    - JOB_NAME=( $CI_JOB_NAME )
@@ -121,7 +122,6 @@ stages:
 .rspec-metadata-pg: &rspec-metadata-pg
  <<: *rspec-metadata
  <<: *use-pg
-  <<: *except-docs

 .rspec-geo-pg-9-6: &rspec-metadata-pg-geo
  <<: *use-pg-9-6
@@ -137,11 +137,11 @@ stages:
 .rspec-metadata-mysql: &rspec-metadata-mysql
  <<: *rspec-metadata
  <<: *use-mysql
-  <<: *except-docs

 .spinach-metadata: &spinach-metadata
  <<: *dedicated-runner
  <<: *pull-cache
+  <<: *except-docs
  stage: test
  script:
    - JOB_NAME=( $CI_JOB_NAME )
@@ -164,12 +164,10 @@ stages:
 .spinach-metadata-pg: &spinach-metadata-pg
  <<: *spinach-metadata
  <<: *use-pg
-  <<: *except-docs

 .spinach-metadata-mysql: &spinach-metadata-mysql
  <<: *spinach-metadata
  <<: *use-mysql
-  <<: *except-docs

 .only-canonical-masters: &only-canonical-masters
  only:
@@ -180,13 +178,8 @@ stages:

 # Trigger a package build in omnibus-gitlab repository
 build-package:
-  image: ruby:2.3-alpine
+  image: ruby:2.4-alpine
  before_script: []
-  services: []
-  variables:
-    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "false"
-    EE_PACKAGE: "true"
  stage: build
  cache: {}
  when: manual
@@ -207,13 +200,9 @@ build-package:
    - apk add --update openssl
    - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs
    - chmod 755 trigger-build-docs
-  services: []
  cache: {}
  dependencies: []
-  artifacts: {}
  variables:
-    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "false"
    GIT_STRATEGY: none
  when: manual
  only:
@@ -246,7 +235,6 @@ review-docs-cleanup:
 # Retrieve knapsack and rspec_flaky reports
 retrieve-tests-metadata:
  <<: *tests-metadata-state
-  <<: *dedicated-runner
  <<: *except-docs
  stage: prepare
  cache:
@@ -264,7 +252,6 @@ retrieve-tests-metadata:

 update-tests-metadata:
  <<: *tests-metadata-state
-  <<: *dedicated-runner
  <<: *only-canonical-masters
  stage: post-test
  cache:
@@ -329,71 +316,71 @@ setup-test-env:
      - public/assets
      - tmp/tests

-rspec-pg 0 25: *rspec-metadata-pg
-rspec-pg 1 25: *rspec-metadata-pg
-rspec-pg 2 25: *rspec-metadata-pg
-rspec-pg 3 25: *rspec-metadata-pg
-rspec-pg 4 25: *rspec-metadata-pg
-rspec-pg 5 25: *rspec-metadata-pg
-rspec-pg 6 25: *rspec-metadata-pg
-rspec-pg 7 25: *rspec-metadata-pg
-rspec-pg 8 25: *rspec-metadata-pg
-rspec-pg 9 25: *rspec-metadata-pg
-rspec-pg 10 25: *rspec-metadata-pg
-rspec-pg 11 25: *rspec-metadata-pg
-rspec-pg 12 25: *rspec-metadata-pg
-rspec-pg 13 25: *rspec-metadata-pg
-rspec-pg 14 25: *rspec-metadata-pg
-rspec-pg 15 25: *rspec-metadata-pg
-rspec-pg 16 25: *rspec-metadata-pg
-rspec-pg 17 25: *rspec-metadata-pg
-rspec-pg 18 25: *rspec-metadata-pg
-rspec-pg 19 25: *rspec-metadata-pg
-rspec-pg 20 25: *rspec-metadata-pg
-rspec-pg 21 25: *rspec-metadata-pg
-rspec-pg 22 25: *rspec-metadata-pg
-rspec-pg 23 25: *rspec-metadata-pg
-rspec-pg 24 25: *rspec-metadata-pg
-
 rspec-pg geo: *rspec-metadata-pg-geo

-rspec-mysql 0 25: *rspec-metadata-mysql
-rspec-mysql 1 25: *rspec-metadata-mysql
-rspec-mysql 2 25: *rspec-metadata-mysql
-rspec-mysql 3 25: *rspec-metadata-mysql
-rspec-mysql 4 25: *rspec-metadata-mysql
-rspec-mysql 5 25: *rspec-metadata-mysql
-rspec-mysql 6 25: *rspec-metadata-mysql
-rspec-mysql 7 25: *rspec-metadata-mysql
-rspec-mysql 8 25: *rspec-metadata-mysql
-rspec-mysql 9 25: *rspec-metadata-mysql
-rspec-mysql 10 25: *rspec-metadata-mysql
-rspec-mysql 11 25: *rspec-metadata-mysql
-rspec-mysql 12 25: *rspec-metadata-mysql
-rspec-mysql 13 25: *rspec-metadata-mysql
-rspec-mysql 14 25: *rspec-metadata-mysql
-rspec-mysql 15 25: *rspec-metadata-mysql
-rspec-mysql 16 25: *rspec-metadata-mysql
-rspec-mysql 17 25: *rspec-metadata-mysql
-rspec-mysql 18 25: *rspec-metadata-mysql
-rspec-mysql 19 25: *rspec-metadata-mysql
-rspec-mysql 20 25: *rspec-metadata-mysql
-rspec-mysql 21 25: *rspec-metadata-mysql
-rspec-mysql 22 25: *rspec-metadata-mysql
-rspec-mysql 23 25: *rspec-metadata-mysql
-rspec-mysql 24 25: *rspec-metadata-mysql
-
-spinach-pg 0 5: *spinach-metadata-pg
-spinach-pg 1 5: *spinach-metadata-pg
-spinach-pg 2 5: *spinach-metadata-pg
-spinach-pg 3 5: *spinach-metadata-pg
-spinach-pg 4 5: *spinach-metadata-pg
-
-spinach-mysql 0 5: *spinach-metadata-mysql
-spinach-mysql 1 5: *spinach-metadata-mysql
-spinach-mysql 2 5: *spinach-metadata-mysql
-spinach-mysql 3 5: *spinach-metadata-mysql
-spinach-mysql 4 5: *spinach-metadata-mysql
+rspec-pg 0 26: *rspec-metadata-pg
+rspec-pg 1 26: *rspec-metadata-pg
+rspec-pg 2 26: *rspec-metadata-pg
+rspec-pg 3 26: *rspec-metadata-pg
+rspec-pg 4 26: *rspec-metadata-pg
+rspec-pg 5 26: *rspec-metadata-pg
+rspec-pg 6 26: *rspec-metadata-pg
+rspec-pg 7 26: *rspec-metadata-pg
+rspec-pg 8 26: *rspec-metadata-pg
+rspec-pg 9 26: *rspec-metadata-pg
+rspec-pg 10 26: *rspec-metadata-pg
+rspec-pg 11 26: *rspec-metadata-pg
+rspec-pg 12 26: *rspec-metadata-pg
+rspec-pg 13 26: *rspec-metadata-pg
+rspec-pg 14 26: *rspec-metadata-pg
+rspec-pg 15 26: *rspec-metadata-pg
+rspec-pg 16 26: *rspec-metadata-pg
+rspec-pg 17 26: *rspec-metadata-pg
+rspec-pg 18 26: *rspec-metadata-pg
+rspec-pg 19 26: *rspec-metadata-pg
+rspec-pg 20 26: *rspec-metadata-pg
+rspec-pg 21 26: *rspec-metadata-pg
+rspec-pg 22 26: *rspec-metadata-pg
+rspec-pg 23 26: *rspec-metadata-pg
+rspec-pg 24 26: *rspec-metadata-pg
+rspec-pg 25 26: *rspec-metadata-pg
+
+rspec-mysql 0 26: *rspec-metadata-mysql
+rspec-mysql 1 26: *rspec-metadata-mysql
+rspec-mysql 2 26: *rspec-metadata-mysql
+rspec-mysql 3 26: *rspec-metadata-mysql
+rspec-mysql 4 26: *rspec-metadata-mysql
+rspec-mysql 5 26: *rspec-metadata-mysql
+rspec-mysql 6 26: *rspec-metadata-mysql
+rspec-mysql 7 26: *rspec-metadata-mysql
+rspec-mysql 8 26: *rspec-metadata-mysql
+rspec-mysql 9 26: *rspec-metadata-mysql
+rspec-mysql 10 26: *rspec-metadata-mysql
+rspec-mysql 11 26: *rspec-metadata-mysql
+rspec-mysql 12 26: *rspec-metadata-mysql
+rspec-mysql 13 26: *rspec-metadata-mysql
+rspec-mysql 14 26: *rspec-metadata-mysql
+rspec-mysql 15 26: *rspec-metadata-mysql
+rspec-mysql 16 26: *rspec-metadata-mysql
+rspec-mysql 17 26: *rspec-metadata-mysql
+rspec-mysql 18 26: *rspec-metadata-mysql
+rspec-mysql 19 26: *rspec-metadata-mysql
+rspec-mysql 20 26: *rspec-metadata-mysql
+rspec-mysql 21 26: *rspec-metadata-mysql
+rspec-mysql 22 26: *rspec-metadata-mysql
+rspec-mysql 23 26: *rspec-metadata-mysql
+rspec-mysql 24 26: *rspec-metadata-mysql
+rspec-mysql 25 26: *rspec-metadata-mysql
+
+spinach-pg 0 4: *spinach-metadata-pg
+spinach-pg 1 4: *spinach-metadata-pg
+spinach-pg 2 4: *spinach-metadata-pg
+spinach-pg 3 4: *spinach-metadata-pg
+
+spinach-mysql 0 4: *spinach-metadata-mysql
+spinach-mysql 1 4: *spinach-metadata-mysql
+spinach-mysql 2 4: *spinach-metadata-mysql
+spinach-mysql 3 4: *spinach-metadata-mysql

 # Static analysis jobs
 .ruby-static-analysis: &ruby-static-analysis

--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -626,7 +626,7 @@ Style/PredicateName:
 # branches, and conditions.
 Metrics/AbcSize:
  Enabled: true
-  Max: 55.25
+  Max: 54.28

 # This cop checks if the length of a block exceeds some maximum value.
 Metrics/BlockLength:
@@ -667,7 +667,7 @@ Metrics/ParameterLists:
 # A complexity metric geared towards measuring complexity for a human reader.
 Metrics/PerceivedComplexity:
  Enabled: true
-  Max: 15
+  Max: 14

 # Lint ########################################################################


--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-0.47.0
+0.49.0
\ No newline at end of file
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'fog-google', '~> 0.5'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.1.0'
+gem 'fog-aliyun', '~> 0.2.0'

 # for Google storage
 gem 'google-api-client', '~> 0.13.6'
@@ -414,7 +414,7 @@ group :ed25519 do
 end

 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.45.0', require: 'gitaly'

 gem 'toml-rb', '~> 0.3.15', require: false


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -238,7 +238,7 @@ GEM
    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
-    fog-aliyun (0.1.0)
+    fog-aliyun (0.2.0)
      fog-core (~> 1.27)
      fog-json (~> 1.0)
      ipaddress (~> 0.8)
@@ -297,7 +297,7 @@ GEM
      po_to_json (>= 1.0.0)
      rails (>= 3.2.0)
    gherkin-ruby (0.3.2)
-    gitaly-proto (0.42.0)
+    gitaly-proto (0.45.0)
      google-protobuf (~> 3.1)
      grpc (~> 1.0)
    github-linguist (4.7.6)
@@ -1050,7 +1050,7 @@ DEPENDENCIES
  flay (~> 2.8.0)
  flipper (~> 0.10.2)
  flipper-active_record (~> 0.10.2)
-  fog-aliyun (~> 0.1.0)
+  fog-aliyun (~> 0.2.0)
  fog-aws (~> 1.4)
  fog-core (~> 1.44)
  fog-google (~> 0.5)
@@ -1065,7 +1065,7 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.42.0)
+  gitaly-proto (~> 0.45.0)
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-license (~> 1.0)

--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
 # GitLab Maintenance Policy

-GitLab follows the [Semantic Versioning](http://semver.org/) for its releases:
-`(Major).(Minor).(Patch)` in a [pragmatic way].
-
- **Major version**: Whenever there is something significant or any backwards
-  incompatible changes are introduced to the public API.
- **Minor version**: When new, backwards compatible functionality is introduced
-  to the public API or a minor feature is introduced, or when a set of smaller
-  features is rolled out.
- **Patch number**: When backwards compatible bug fixes are introduced that fix
-  incorrect behavior.
-
-The current stable release will receive security patches and bug fixes
-(eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable
-release where the minor version is increased numerically by increments of one
-(eg. `8.9 -> 8.10`).
-
-Our current policy is to support one stable release at any given time, but for
-medium-level security issues, we may consider [backporting to the previous two
-monthly releases][rel-sec].
-
-We encourage everyone to run the latest stable release to ensure that you can
-easily upgrade to the most secure and feature-rich GitLab experience. In order
-to make sure you can easily run the most recent stable release, we are working
-hard to keep the update process simple and reliable.
-
-More information about the release procedures can be found in our
-[release-tools documentation][rel]. You may also want to read our
-[Responsible Disclosure Policy][disclosure].
-
-[rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting
-[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/
-[disclosure]: https://about.gitlab.com/disclosure/
-[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e
+See [doc/policy/maintenance.md](doc/policy/maintenance.md)
--- a/VERSION
+++ b/VERSION
-10.1.0-pre
+10.2.0-pre
--- a/app/assets/images/auth_buttons/signin_with_google.png
+++ b/app/assets/images/auth_buttons/signin_with_google.png
--- a/app/assets/javascripts/blob/blob_file_dropzone.js
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
 /* eslint-disable func-names, object-shorthand, prefer-arrow-callback */
-/* global Dropzone */
-
+import Dropzone from 'dropzone';
 import '../lib/utils/url_utility';
 import { HIDDEN_CLASS } from '../lib/utils/constants';
 import csrf from '../lib/utils/csrf';

--- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
@@ -25,6 +25,11 @@
        type: String,
        required: true,
      },
+      viewType: {
+        type: String,
+        required: false,
+        default: 'child',
+      },
    },
    mixins: [
      pipelinesMixin,
@@ -110,6 +115,7 @@
        :pipelines="state.pipelines"
        :update-graph-dropdown="updateGraphDropdown"
        :auto-devops-help-path="autoDevopsHelpPath"
+        :view-type="viewType"
        />
    </div>
  </div>

--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
-/* eslint-disable class-methods-use-this */
-
 import './lib/utils/url_utility';
 import FilesCommentButton from './files_comment_button';
 import SingleFileDiff from './single_file_diff';
@@ -8,7 +6,7 @@ import imageDiffHelper from './image_diff/helpers/index';
 const UNFOLD_COUNT = 20;
 let isBound = false;

-class Diff {
+export default class Diff {
  constructor() {
    const $diffFile = $('.files .diff-file');

@@ -104,7 +102,7 @@ class Diff {
    }
    this.highlightSelectedLine();
  }
-
+  // eslint-disable-next-line class-methods-use-this
  handleParallelLineDown(e) {
    const line = $(e.currentTarget);
    const table = line.closest('table');
@@ -116,11 +114,11 @@ class Diff {
      table.addClass(`${lineClass}-selected`);
    }
  }
-
+  // eslint-disable-next-line class-methods-use-this
  diffViewType() {
    return $('.inline-parallel-buttons a.active').data('view-type');
  }
-
+  // eslint-disable-next-line class-methods-use-this
  lineNumbers(line) {
    const children = line.find('.diff-line-num').toArray();
    if (children.length !== 2) {
@@ -128,7 +126,7 @@ class Diff {
    }
    return children.map(elm => parseInt($(elm).data('linenumber'), 10) || 0);
  }
-
+  // eslint-disable-next-line class-methods-use-this
  highlightSelectedLine() {
    const hash = gl.utils.getLocationHash();
    const $diffFiles = $('.diff-file');
@@ -141,6 +139,3 @@ class Diff {
    }
  }
 }
-
-window.gl = window.gl || {};
-window.gl.Diff = Diff;
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -8,7 +8,8 @@
 /* global NewBranchForm */
 /* global NotificationsForm */
 /* global NotificationsDropdown */
-/* global GroupAvatar */
+import groupAvatar from './group_avatar';
+import GroupLabelSubscription from './group_label_subscription';
 /* global LineHighlighter */
 import BuildArtifacts from './build_artifacts';
 import CILintEditor from './ci_lint_editor';
@@ -90,6 +91,7 @@ import U2FAuthenticate from './u2f/authenticate';
 import Members from './members';
 import memberExpirationDate from './member_expiration_date';
 import DueDateSelectors from './due_date_select';
+import Diff from './diff';

 // EE-only
 import ApproversSelect from './approvers_select';
@@ -262,7 +264,7 @@ import initGroupAnalytics from './init_group_analytics';
          new GLForm($('.milestone-form'), true);
          break;
        case 'projects:compare:show':
-          new gl.Diff();
+          new Diff();
          initChangesDropdown();
          break;
        case 'projects:branches:new':
@@ -300,7 +302,7 @@ import initGroupAnalytics from './init_group_analytics';
          new UserCallout();
        case 'projects:merge_requests:creations:diffs':
        case 'projects:merge_requests:edit':
-          new gl.Diff();
+          new Diff();
          shortcut_handler = new ShortcutsNavigation();
          new GLForm($('.merge-request-form'), true);
          new IssuableForm($('.merge-request-form'));
@@ -334,7 +336,7 @@ import initGroupAnalytics from './init_group_analytics';
          new GLForm($('.release-form'), true);
          break;
        case 'projects:merge_requests:show':
-          new gl.Diff();
+          new Diff();
          shortcut_handler = new ShortcutsIssuable(true);
          new ZenMode();

@@ -350,7 +352,7 @@ import initGroupAnalytics from './init_group_analytics';
          new gl.Activities();
          break;
        case 'projects:commit:show':
-          new gl.Diff();
+          new Diff();
          new ZenMode();
          shortcut_handler = new ShortcutsNavigation();
          new MiniPipelineGraph({
@@ -459,11 +461,11 @@ import initGroupAnalytics from './init_group_analytics';
        case 'admin:groups:create':
          BindInOut.initAll();
          new Group();
-          new GroupAvatar();
+          groupAvatar();
          break;
        case 'groups:edit':
        case 'admin:groups:edit':
-          new GroupAvatar();
+          groupAvatar();
          break;
        case 'projects:tree:show':
          shortcut_handler = new ShortcutsNavigation();
@@ -518,7 +520,7 @@ import initGroupAnalytics from './init_group_analytics';
            const $el = $(el);

            if ($el.find('.dropdown-group-label').length) {
-              new gl.GroupLabelSubscription($el);
+              new GroupLabelSubscription($el);
            } else {
              new gl.ProjectLabelSubscription($el);
            }

--- a/app/assets/javascripts/dropzone_input.js
+++ b/app/assets/javascripts/dropzone_input.js
--- a/app/assets/javascripts/files_comment_button.js
+++ b/app/assets/javascripts/files_comment_button.js
-/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, max-len, one-var, one-var-declaration-per-line, quotes, prefer-template, newline-per-chained-call, comma-dangle, new-cap, no-else-return, consistent-return */
-/* global notes */
-
 /* Developer beware! Do not add logic to showButton or hideButton
 * that will force a reflow. Doing so will create a signficant performance
 * bottleneck for pages with large diffs. For a comprehensive list of what
@@ -20,8 +17,10 @@ const DIFF_EXPANDED_CLASS = 'diff-expanded';

 export default {
  init($diffFile) {
-    /* Caching is used only when the following members are *true*. This is because there are likely to be
-     * differently configured versions of diffs in the same session. However if these values are true, they
+    /* Caching is used only when the following members are *true*.
+     * This is because there are likely to be
+     * differently configured versions of diffs in the same session.
+     * However if these values are true, they
     * will be true in all cases */

    if (!this.userCanCreateNote) {

--- a/app/assets/javascripts/gl_form.js
+++ b/app/assets/javascripts/gl_form.js
-/* global DropzoneInput */
 /* global autosize */

 import GfmAutoComplete from './gfm_auto_complete';
+import dropzoneInput from './dropzone_input';

 export default class GLForm {
  constructor(form, enableGFM = false) {
@@ -41,7 +41,7 @@ export default class GLForm {
        mergeRequests: this.enableGFM,
        labels: this.enableGFM,
      });
-      new DropzoneInput(this.form); // eslint-disable-line no-new
+      dropzoneInput(this.form);
      autosize(this.textarea);
    }
    // form and textarea event listeners

--- a/app/assets/javascripts/group_avatar.js
+++ b/app/assets/javascripts/group_avatar.js
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, no-var, one-var, one-var-declaration-per-line, no-useless-escape, max-len */
-
-window.GroupAvatar = (function() {
-  function GroupAvatar() {
-    $('.js-choose-group-avatar-button').on("click", function() {
-      var form;
-      form = $(this).closest("form");
-      return form.find(".js-group-avatar-input").click();
-    });
-    $('.js-group-avatar-input').on("change", function() {
-      var filename, form;
-      form = $(this).closest("form");
-      filename = $(this).val().replace(/^.*[\\\/]/, '');
-      return form.find(".js-avatar-filename").text(filename);
-    });
-  }
-
-  return GroupAvatar;
-})();
+export default function groupAvatar() {
+  $('.js-choose-group-avatar-button').on('click', function onClickGroupAvatar() {
+    const form = $(this).closest('form');
+    return form.find('.js-group-avatar-input').click();
+  });
+  $('.js-group-avatar-input').on('change', function onChangeAvatarInput() {
+    const form = $(this).closest('form');
+    // eslint-disable-next-line no-useless-escape
+    const filename = $(this).val().replace(/^.*[\\\/]/, '');
+    return form.find('.js-avatar-filename').text(filename);
+  });
+}
--- a/app/assets/javascripts/group_label_subscription.js
+++ b/app/assets/javascripts/group_label_subscription.js
-/* eslint-disable func-names, object-shorthand, comma-dangle, wrap-iife, space-before-function-paren, no-param-reassign, max-len */
-
-class GroupLabelSubscription {
+export default class GroupLabelSubscription {
  constructor(container) {
    const $container = $(container);
    this.$dropdown = $container.find('.dropdown');
@@ -18,7 +16,7 @@ class GroupLabelSubscription {

    $.ajax({
      type: 'POST',
-      url: url
+      url,
    }).done(() => {
      this.toggleSubscriptionButtons();
      this.$unsubscribeButtons.removeAttr('data-url');
@@ -35,7 +33,7 @@ class GroupLabelSubscription {

    $.ajax({
      type: 'POST',
-      url: url
+      url,
    }).done(() => {
      this.toggleSubscriptionButtons();
    });
@@ -47,6 +45,3 @@ class GroupLabelSubscription {
    this.$unsubscribeButtons.toggleClass('hidden');
  }
 }
-
-window.gl = window.gl || {};
-window.gl.GroupLabelSubscription = GroupLabelSubscription;
--- a/app/assets/javascripts/issuable_context.js
+++ b/app/assets/javascripts/issuable_context.js
@@ -51,20 +51,19 @@ const PARTICIPANTS_ROW_COUNT = 7;
    }

    IssuableContext.prototype.initParticipants = function() {
-      $(document).on("click", ".js-participants-more", this.toggleHiddenParticipants);
-      return $(".js-participants-author").each(function(i) {
+      $(document).on('click', '.js-participants-more', this.toggleHiddenParticipants);
+      return $('.js-participants-author').each(function(i) {
        if (i >= PARTICIPANTS_ROW_COUNT) {
-          return $(this).addClass("js-participants-hidden").hide();
+          return $(this).addClass('js-participants-hidden').hide();
        }
      });
    };

-    IssuableContext.prototype.toggleHiddenParticipants = function(e) {
-      var currentText, lessText, originalText;
-      e.preventDefault();
-      currentText = $(this).text().trim();
-      lessText = $(this).data("less-text");
-      originalText = $(this).data("original-text");
+    IssuableContext.prototype.toggleHiddenParticipants = function() {
+      const currentText = $(this).text().trim();
+      const lessText = $(this).data('less-text');
+      const originalText = $(this).data('original-text');
+
      if (currentText === originalText) {
        $(this).text(lessText);

@@ -73,7 +72,7 @@ const PARTICIPANTS_ROW_COUNT = 7;
        $(this).text(originalText);
      }

-      $(".js-participants-hidden").toggle();
+      $('.js-participants-hidden').toggle();
    };

    return IssuableContext;

--- a/app/assets/javascripts/issue_show/components/fields/title.vue
+++ b/app/assets/javascripts/issue_show/components/fields/title.vue
@@ -16,15 +16,15 @@
  <fieldset>
    <label
      class="sr-only"
-      for="issue-title">
+      for="issuable-title">
      Title
    </label>
    <input
-      id="issue-title"
+      id="issuable-title"
      class="form-control"
      type="text"
-      placeholder="Issue title"
-      aria-label="Issue title"
+      placeholder="Title"
+      aria-label="Title"
      v-model="formState.title"
      @keydown.meta.enter="updateIssuable"
      @keydown.ctrl.enter="updateIssuable" />

--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -56,8 +56,6 @@ import './gl_dropdown';
 import './gl_field_error';
 import './gl_field_errors';
 import './gl_form';
-import './group_avatar';
-import './group_label_subscription';
 import './groups_select';
 import './header';
 import './importer_status';

--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -11,8 +11,8 @@ import {
  handleLocationHash,
  isMetaClick,
 } from './lib/utils/common_utils';
-
 import initDiscussionTab from './image_diff/init_discussion_tab';
+import Diff from './diff';

 /* eslint-disable max-len */
 // MergeRequestTabs
@@ -292,7 +292,7 @@ import initDiscussionTab from './image_diff/init_discussion_tab';
          }
          this.diffsLoaded = true;

-          new gl.Diff();
+          new Diff();
          this.scrollToElement('#diffs');

          $('.diff-file').each((i, el) => {

--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -13,7 +13,6 @@ import $ from 'jquery';
 import _ from 'underscore';
 import Cookies from 'js-cookie';
 import autosize from 'vendor/autosize';
-import Dropzone from 'dropzone';
 import 'vendor/jquery.caret'; // required by jquery.atwho
 import 'vendor/jquery.atwho';
 import AjaxCache from '~/lib/utils/ajax_cache';
@@ -28,7 +27,6 @@ import { ajaxPost, isInViewport, getPagePath, scrollToElement, isMetaKey } from
 import imageDiffHelper from './image_diff/helpers/index';

 window.autosize = autosize;
-window.Dropzone = Dropzone;

 function normalizeNewlines(str) {
  return str.replace(/\r\n/g, '\n');
@@ -1283,10 +1281,12 @@ export default class Notes {
   * Get data from Form attributes to use for saving/submitting comment.
   */
  getFormData($form) {
+    const content = $form.find('.js-note-text').val();
    return {
      formData: $form.serialize(),
-      formContent: _.escape($form.find('.js-note-text').val()),
+      formContent: _.escape(content),
      formAction: $form.attr('action'),
+      formContentOriginal: content,
    };
  }

@@ -1418,7 +1418,7 @@ export default class Notes {
    const isMainForm = $form.hasClass('js-main-target-form');
    const isDiscussionForm = $form.hasClass('js-discussion-note-form');
    const isDiscussionResolve = $submitBtn.hasClass('js-comment-resolve-button');
-    const { formData, formContent, formAction } = this.getFormData($form);
+    const { formData, formContent, formAction, formContentOriginal } = this.getFormData($form);
    let noteUniqueId;
    let systemNoteUniqueId;
    let hasQuickActions = false;
@@ -1577,7 +1577,7 @@ export default class Notes {
          $form = $notesContainer.parent().find('form');
        }

-        $form.find('.js-note-text').val(formContent);
+        $form.find('.js-note-text').val(formContentOriginal);
        this.reenableTargetFormSubmitButton(e);
        this.addNoteError($form);
      });

--- a/app/assets/javascripts/pipelines/components/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines.vue
@@ -12,6 +12,15 @@
        type: Object,
        required: true,
      },
+      // Can be rendered in 3 different places, with some visual differences
+      // Accepts root | child
+      // `root` -> main view
+      // `child` -> rendered inside MR or Commit View
+      viewType: {
+        type: String,
+        required: false,
+        default: 'root',
+      },
    },
    components: {
      tablePagination,
@@ -187,7 +196,7 @@
        :empty-state-svg-path="emptyStateSvgPath"
        />

-      <error-state 
+      <error-state
        v-if="shouldRenderErrorState"
        :error-state-svg-path="errorStateSvgPath"
        />
@@ -206,6 +215,7 @@
          :pipelines="state.pipelines"
          :update-graph-dropdown="updateGraphDropdown"
          :auto-devops-help-path="autoDevopsPath"
+          :view-type="viewType"
          />
      </div>


--- a/app/assets/javascripts/pipelines/components/pipelines_table.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue
@@ -21,6 +21,10 @@
        type: String,
        required: true,
      },
+      viewType: {
+        type: String,
+        required: true,
+      },
    },
    components: {
      pipelinesTableRowComponent,
@@ -59,6 +63,7 @@
      :pipeline="model"
      :update-graph-dropdown="updateGraphDropdown"
      :auto-devops-help-path="autoDevopsHelpPath"
+      :view-type="viewType"
    />
  </div>
 </template>
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -29,6 +29,10 @@ export default {
      type: String,
      required: true,
    },
+    viewType: {
+      type: String,
+      required: true,
+    },
  },
  components: {
    asyncButtonComponent,
@@ -203,9 +207,13 @@ export default {

    displayPipelineActions() {
      return this.pipeline.flags.retryable ||
-             this.pipeline.flags.cancelable ||
-             this.pipeline.details.manual_actions.length ||
-             this.pipeline.details.artifacts.length;
+        this.pipeline.flags.cancelable ||
+        this.pipeline.details.manual_actions.length ||
+        this.pipeline.details.artifacts.length;
+    },
+
+    isChildView() {
+      return this.viewType === 'child';
    },
  },
 };
@@ -218,7 +226,10 @@ export default {
        Status
      </div>
      <div class="table-mobile-content">
-        <ci-badge :status="pipelineStatus"/>
+        <ci-badge
+          :status="pipelineStatus"
+          :show-text="!isChildView"
+          />
      </div>
    </div>

@@ -240,7 +251,9 @@ export default {
          :commit-url="commitUrl"
          :short-sha="commitShortSha"
          :title="commitTitle"
-          :author="commitAuthor"/>
+          :author="commitAuthor"
+          :show-branch="!isChildView"
+          />
      </div>
    </div>


--- a/app/assets/javascripts/registry/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/components/collapsible_container.vue
@@ -57,7 +57,7 @@
      },

      showError(message) {
-        Flash((errorMessages[message]));
+        Flash(errorMessages[message]);
      },
    },
  };

--- a/app/assets/javascripts/registry/components/table_registry.vue
+++ b/app/assets/javascripts/registry/components/table_registry.vue
@@ -57,7 +57,7 @@
      },

      showError(message) {
-        Flash((errorMessages[message]));
+        Flash(errorMessages[message]);
      },
    },
  };

--- a/app/assets/javascripts/registry/stores/actions.js
+++ b/app/assets/javascripts/registry/stores/actions.js
@@ -29,11 +29,9 @@ export const fetchList = ({ commit }, { repo, page }) => {
    });
 };

-export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath)
-  .then(res => res.json());
+export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath);

-export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath)
-  .then(res => res.json());
+export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath);

 export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data);
 export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING);
--- a/app/assets/javascripts/registry/stores/mutations.js
+++ b/app/assets/javascripts/registry/stores/mutations.js
@@ -38,7 +38,7 @@ export default {
      tag: element.name,
      revision: element.revision,
      shortRevision: element.short_revision,
-      size: element.size,
+      size: element.total_size,
      layers: element.layers,
      location: element.location,
      createdAt: element.created_at,

--- a/app/assets/javascripts/repo/components/new_branch_form.vue
+++ b/app/assets/javascripts/repo/components/new_branch_form.vue
+<script>
+  import flash, { hideFlash } from '../../flash';
+  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+  import eventHub from '../event_hub';
+
+  export default {
+    components: {
+      loadingIcon,
+    },
+    props: {
+      currentBranch: {
+        type: String,
+        required: true,
+      },
+    },
+    data() {
+      return {
+        branchName: '',
+        loading: false,
+      };
+    },
+    computed: {
+      btnDisabled() {
+        return this.loading || this.branchName === '';
+      },
+    },
+    methods: {
+      toggleDropdown() {
+        this.$dropdown.dropdown('toggle');
+      },
+      submitNewBranch() {
+        // need to query as the element is appended outside of Vue
+        const flashEl = this.$refs.flashContainer.querySelector('.flash-alert');
+
+        this.loading = true;
+
+        if (flashEl) {
+          hideFlash(flashEl, false);
+        }
+
+        eventHub.$emit('createNewBranch', this.branchName);
+      },
+      showErrorMessage(message) {
+        this.loading = false;
+        flash(message, 'alert', this.$el);
+      },
+      createdNewBranch(newBranchName) {
+        this.loading = false;
+        this.branchName = '';
+
+        if (this.dropdownText) {
+          this.dropdownText.textContent = newBranchName;
+        }
+      },
+    },
+    created() {
+      // Dropdown is outside of Vue instance & is controlled by Bootstrap
+      this.$dropdown = $('.git-revision-dropdown');
+
+      // text element is outside Vue app
+      this.dropdownText = document.querySelector('.project-refs-form .dropdown-toggle-text');
+
+      eventHub.$on('createNewBranchSuccess', this.createdNewBranch);
+      eventHub.$on('createNewBranchError', this.showErrorMessage);
+      eventHub.$on('toggleNewBranchDropdown', this.toggleDropdown);
+    },
+    destroyed() {
+      eventHub.$off('createNewBranchSuccess', this.createdNewBranch);
+      eventHub.$off('toggleNewBranchDropdown', this.toggleDropdown);
+      eventHub.$off('createNewBranchError', this.showErrorMessage);
+    },
+  };
+</script>
+
+<template>
+  <div>
+    <div
+      class="flash-container"
+      ref="flashContainer"
+    >
+    </div>
+    <p>
+      Create from:
+      <code>{{ currentBranch }}</code>
+    </p>
+    <input
+      class="form-control js-new-branch-name"
+      type="text"
+      placeholder="Name new branch"
+      v-model="branchName"
+      @keyup.enter.stop.prevent="submitNewBranch"
+    />
+    <div class="prepend-top-default clearfix">
+      <button
+        type="button"
+        class="btn btn-primary pull-left"
+        :disabled="btnDisabled"
+        @click.stop.prevent="submitNewBranch"
+      >
+        <loading-icon
+          v-if="loading"
+          :inline="true"
+        />
+        <span>Create</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-default pull-right"
+        @click.stop.prevent="toggleDropdown"
+      >
+        Cancel
+      </button>
+    </div>
+  </div>
+</template>
--- a/app/assets/javascripts/repo/components/repo.vue
+++ b/app/assets/javascripts/repo/components/repo.vue
@@ -8,7 +8,9 @@ import RepoMixin from '../mixins/repo_mixin';
 import PopupDialog from '../../vue_shared/components/popup_dialog.vue';
 import Store from '../stores/repo_store';
 import Helper from '../helpers/repo_helper';
+import Service from '../services/repo_service';
 import MonacoLoaderHelper from '../helpers/monaco_loader_helper';
+import eventHub from '../event_hub';

 export default {
  data() {
@@ -24,12 +26,19 @@ export default {
    PopupDialog,
    RepoPreview,
  },
-
+  created() {
+    eventHub.$on('createNewBranch', this.createNewBranch);
+  },
  mounted() {
    Helper.getContent().catch(Helper.loadingError);
  },
-
+  destroyed() {
+    eventHub.$off('createNewBranch', this.createNewBranch);
+  },
  methods: {
+    getCurrentLocation() {
+      return location.href;
+    },
    toggleDialogOpen(toggle) {
      this.dialog.open = toggle;
    },
@@ -38,8 +47,25 @@ export default {
      this.toggleDialogOpen(false);
      this.dialog.status = status;
    },
-
    toggleBlobView: Store.toggleBlobView,
+    createNewBranch(branch) {
+      Service.createBranch({
+        branch,
+        ref: Store.currentBranch,
+      }).then((res) => {
+        const newBranchName = res.data.name;
+        const newUrl = this.getCurrentLocation().replace(Store.currentBranch, newBranchName);
+
+        Store.currentBranch = newBranchName;
+
+        history.pushState({ key: Helper.key }, '', newUrl);
+
+        eventHub.$emit('createNewBranchSuccess', newBranchName);
+        eventHub.$emit('toggleNewBranchDropdown');
+      }).catch((err) => {
+        eventHub.$emit('createNewBranchError', err.response.data.message);
+      });
+    },
  },
 };
 </script>

--- a/app/assets/javascripts/repo/components/repo_file.vue
+++ b/app/assets/javascripts/repo/components/repo_file.vue
@@ -28,6 +28,9 @@
          marginLeft: `${this.file.level * 16}px`,
        };
      },
+      shortId() {
+        return this.file.id.substr(0, 8);
+      },
    },
    methods: {
      linkClicked(file) {
@@ -55,6 +58,17 @@
      >
        {{ file.name }}
      </a>
+      <template v-if="file.type === 'submodule' && file.id">
+        @
+        <span class="commit-sha">
+          <a
+            @click.stop
+            :href="file.tree_url"
+          >
+            {{ shortId }}
+          </a>
+        </span>
+      </template>
    </td>

    <template v-if="!isMini">
@@ -69,7 +83,10 @@
      </td>

      <td class="commit-update hidden-xs text-right">
-        <span :title="tooltipTitle(file.lastCommit.updatedAt)">
+        <span
+          v-if="file.lastCommit.updatedAt"
+          :title="tooltipTitle(file.lastCommit.updatedAt)"
+        >
          {{ timeFormated(file.lastCommit.updatedAt) }}
        </span>
      </td>

--- a/app/assets/javascripts/repo/components/repo_sidebar.vue
+++ b/app/assets/javascripts/repo/components/repo_sidebar.vue
@@ -74,6 +74,10 @@ export default {
      if (file.type === 'tree' && file.opened) {
        Helper.setDirectoryToClosed(file);
        Store.setActiveLine(lineNumber);
+      } else if (file.type === 'submodule') {
+        file.loading = true;
+
+        gl.utils.visitUrl(file.url);
      } else {
        const openFile = Helper.getFileFromPath(file.url);


--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -95,7 +95,7 @@ const RepoHelper = {
    return Service.getContent()
    .then((response) => {
      const data = response.data;
-      if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title'];
+      if (response.headers && response.headers['page-title']) data.pageTitle = decodeURI(response.headers['page-title']);
      if (response.headers && response.headers['is-root'] && !Store.isInitialRoot) {
        Store.isRoot = convertPermissionToBoolean(response.headers['is-root']);
        Store.isInitialRoot = Store.isRoot;
@@ -157,12 +157,14 @@ const RepoHelper = {
  },

  serializeRepoEntity(type, entity, level = 0) {
-    const { url, name, icon, last_commit } = entity;
+    const { id, url, name, icon, last_commit, tree_url } = entity;

    return {
+      id,
      type,
      name,
      url,
+      tree_url,
      level,
      icon: `fa-${icon}`,
      files: [],

--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -5,6 +5,7 @@ import Service from './services/repo_service';
 import Store from './stores/repo_store';
 import Repo from './components/repo.vue';
 import RepoEditButton from './components/repo_edit_button.vue';
+import newBranchForm from './components/new_branch_form.vue';
 import Translate from '../vue_shared/translate';

 function initDropdowns() {
@@ -62,6 +63,26 @@ function initRepoEditButton(el) {
  });
 }

+function initNewBranchForm() {
+  const el = document.querySelector('.js-new-branch-dropdown');
+
+  if (!el) return null;
+
+  return new Vue({
+    el,
+    components: {
+      newBranchForm,
+    },
+    render(createElement) {
+      return createElement('new-branch-form', {
+        props: {
+          currentBranch: Store.currentBranch,
+        },
+      });
+    },
+  });
+}
+
 function initRepoBundle() {
  const repo = document.getElementById('repo');
  const editButton = document.querySelector('.editable-mode');
@@ -73,6 +94,7 @@ function initRepoBundle() {

  initRepo(repo);
  initRepoEditButton(editButton);
+  initNewBranchForm();
 }

 $(initRepoBundle);

--- a/app/assets/javascripts/repo/services/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
 import axios from 'axios';
+import csrf from '../../lib/utils/csrf';
 import Store from '../stores/repo_store';
 import Api from '../../api';
 import Helper from '../helpers/repo_helper';

+axios.defaults.headers.common[csrf.headerKey] = csrf.token;
+
 const RepoService = {
  url: '',
  options: {
@@ -10,6 +13,7 @@ const RepoService = {
      format: 'json',
    },
  },
+  createBranchPath: '/api/:version/projects/:id/repository/branches',
  richExtensionRegExp: /md/,

  getRaw(url) {
@@ -73,6 +77,12 @@ const RepoService = {
      .then(this.commitFlash);
  },

+  createBranch(payload) {
+    const url = Api.buildUrl(this.createBranchPath)
+      .replace(':id', Store.projectId);
+    return axios.post(url, payload);
+  },
+
  commitFlash(data) {
    if (data.short_id && data.stats) {
      window.Flash(`Your changes have been committed. Commit ${data.short_id} with ${data.stats.additions} additions, ${data.stats.deletions} deletions.`, 'notice');

--- a/app/assets/javascripts/repo/stores/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -13,6 +13,7 @@ const RepoStore = {
  projectId: '',
  projectName: '',
  projectUrl: '',
+  branchUrl: '',
  blobRaw: '',
  currentBlobView: 'repo-preview',
  openedFiles: [],

--- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
 <script>
-import ciIcon from './ci_icon.vue';
-/**
- * Renders CI Badge link with CI icon and status text based on
- * API response shared between all places where it is used.
- *
- * Receives status object containing:
- * status: {
- *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
- *   group:"running" // used for CSS class
- *   icon: "icon_status_running" // used to render the icon
- *   label:"running" // used for potential tooltip
- *   text:"running" // text rendered
- * }
- *
- * Used in:
- * - Pipelines table - first column
- * - Jobs table - first column
- * - Pipeline show view - header
- * - Job show view - header
- * - MR widget
- */
+  import ciIcon from './ci_icon.vue';
+  import tooltip from '../directives/tooltip';
+  /**
+   * Renders CI Badge link with CI icon and status text based on
+   * API response shared between all places where it is used.
+   *
+   * Receives status object containing:
+   * status: {
+   *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
+   *   group:"running" // used for CSS class
+   *   icon: "icon_status_running" // used to render the icon
+   *   label:"running" // used for potential tooltip
+   *   text:"running" // text rendered
+   * }
+   *
+   * Used in:
+   * - Pipelines table - first column
+   * - Jobs table - first column
+   * - Pipeline show view - header
+   * - Job show view - header
+   * - MR widget
+   */

-export default {
-  props: {
-    status: {
-      type: Object,
-      required: true,
+  export default {
+    props: {
+      status: {
+        type: Object,
+        required: true,
+      },
+      showText: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
    },
-  },
-
-  components: {
-    ciIcon,
-  },
-
-  computed: {
-    cssClass() {
-      const className = this.status.group;
+    components: {
+      ciIcon,
+    },
+    directives: {
+      tooltip,
+    },
+    computed: {
+      cssClass() {
+        const className = this.status.group;

-      return className ? `ci-status ci-${this.status.group}` : 'ci-status';
+        return className ? `ci-status ci-${className}` : 'ci-status';
+      },
    },
-  },
-};
+  };
 </script>
 <template>
  <a
    :href="status.details_path"
-    :class="cssClass">
+    :class="cssClass"
+    v-tooltip
+    :title="!showText ? status.text : ''">
    <ci-icon :status="status" />
-    {{status.text}}
+
+    <template v-if="showText">
+      {{status.text}}
+    </template>
  </a>
 </template>
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -63,14 +63,17 @@
        required: false,
        default: () => ({}),
      },
+      showBranch: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
    },
    computed: {
      /**
       * Used to verify if all the properties needed to render the commit
       * ref section were provided.
       *
-       * TODO: Improve this! Use lodash _.has when we have it.
-       *
       * @returns {Boolean}
       */
      hasCommitRef() {
@@ -80,8 +83,6 @@
       * Used to verify if all the properties needed to render the commit
       * author section were provided.
       *
-       * TODO: Improve this! Use lodash _.has when we have it.
-       *
       * @returns {Boolean}
       */
      hasAuthor() {
@@ -114,31 +115,30 @@
 </script>
 <template>
  <div class="branch-commit">
-    <div
-      v-if="hasCommitRef"
-      class="icon-container hidden-xs">
-      <i
-        v-if="tag"
-        class="fa fa-tag"
-        aria-hidden="true">
-      </i>
-      <i
-        v-if="!tag"
-        class="fa fa-code-fork"
-        aria-hidden="true">
-      </i>
-    </div>
-
-    <a
-      v-if="hasCommitRef"
-      class="ref-name hidden-xs"
-      :href="commitRef.ref_url"
-      v-tooltip
-      data-container="body"
-      :title="commitRef.name">
-      {{commitRef.name}}
-    </a>
+    <template v-if="hasCommitRef && showBranch">
+      <div
+        class="icon-container hidden-xs">
+        <i
+          v-if="tag"
+          class="fa fa-tag"
+          aria-hidden="true">
+        </i>
+        <i
+          v-if="!tag"
+          class="fa fa-code-fork"
+          aria-hidden="true">
+        </i>
+      </div>

+      <a
+        class="ref-name hidden-xs"
+        :href="commitRef.ref_url"
+        v-tooltip
+        data-container="body"
+        :title="commitRef.name">
+        {{commitRef.name}}
+      </a>
+    </template>
    <div
      v-html="commitIconSvg"
      class="commit-icon js-commit-icon">

--- a/app/assets/javascripts/zen_mode.js
+++ b/app/assets/javascripts/zen_mode.js
@@ -11,8 +11,6 @@ import Dropzone from 'dropzone';
 import 'mousetrap';
 import 'mousetrap/plugins/pause/mousetrap-pause';

-window.Dropzone = Dropzone;
-
 //
 // ### Events
 //

--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -23,6 +23,11 @@
    @include webkit-prefix(animation-duration, 2s);
  }

+  &.spin {
+    transform-origin: center;
+    animation: spin 4s linear infinite;
+  }
+
  &.flipOutX,
  &.flipOutY,
  &.bounceIn,
@@ -271,3 +276,9 @@ a {
    transform: translateX(468px);
  }
 }
+
+@keyframes spin {
+  100% {
+    transform: rotate(360deg);
+  }
+}
--- a/app/assets/stylesheets/framework/contextual-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -330,7 +330,7 @@
  position: fixed;
  bottom: 0;
  padding: 16px;
-  background-color: $gray-normal;
+  background-color: $gray-light;
  border: 0;
  border-top: 2px solid $border-color;
  color: $gl-text-color-secondary;

--- a/app/assets/stylesheets/framework/tooltips.scss
+++ b/app/assets/stylesheets/framework/tooltips.scss
@@ -3,5 +3,5 @@
  border-radius: $border-radius-default;
  line-height: 16px;
  font-weight: $gl-font-weight-normal;
-  padding: $gl-btn-padding;
+  padding: 8px;
 }
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -361,6 +361,6 @@ class ApplicationController < ActionController::Base

  def set_page_title_header
    # Per https://tools.ietf.org/html/rfc5987, headers need to be ISO-8859-1, not UTF-8
-    response.headers['Page-Title'] = page_title('GitLab').encode('ISO-8859-1')
+    response.headers['Page-Title'] = URI.escape(page_title('GitLab'))
  end
 end
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -148,6 +148,17 @@ class GroupsController < Groups::ApplicationController
  end

  def load_events
+    params[:sort] ||= 'latest_activity_desc'
+
+    options = {}
+    options[:only_owned] = true if params[:shared] == '0'
+    options[:only_shared] = true if params[:shared] == '1'
+
+    @projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user)
+                  .execute
+                  .includes(:namespace)
+                  .page(params[:page])
+
    @events = EventCollection
      .new(@projects, offset: params[:offset].to_i, filter: event_filter)
      .to_a

--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -48,6 +48,8 @@ class Projects::CommitsController < Projects::ApplicationController
  private

  def set_commits
+    render_404 unless request.format == :atom || @repository.blob_at(@commit.id, @path) || @repository.tree(@commit.id, @path).entries.present?
+
    @limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i
    search = params[:search]


--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -313,4 +313,8 @@ module ApplicationHelper
  def show_new_repo?
    cookies["new_repo"] == "true" && body_data_page != 'projects:show'
  end
+
+  def locale_path
+    asset_path("locale/#{Gitlab::I18n.locale}/app.js")
+  end
 end
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -36,7 +36,8 @@ module PreferencesHelper
  def project_view_choices
    [
      ['Files and Readme (default)', :files],
-      ['Activity', :activity]
+      ['Activity', :activity],
+      ['Readme', :readme]
    ]
  end


--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -17,7 +17,7 @@ module ProjectsHelper
  end

  def link_to_member_avatar(author, opts = {})
-    default_opts = { size: 16 }
+    default_opts = { size: 16, lazy_load: false }
    opts = default_opts.merge(opts)

    classes = %W[avatar avatar-inline s#{opts[:size]}]
@@ -29,8 +29,26 @@ module ProjectsHelper
    image_tag(src, width: opts[:size], class: classes, alt: '', "data-src" => avatar)
  end

+  def author_content_tag(author, opts = {})
+    default_opts = { author_class: 'author', tooltip: false, by_username: false }
+    opts = default_opts.merge(opts)
+
+    has_tooltip = !opts[:by_username] && opts[:tooltip]
+
+    username = opts[:by_username] ? author.to_reference : author.name
+    name_tag_options = { class: [opts[:author_class]] }
+
+    if has_tooltip
+      name_tag_options[:title] = author.to_reference
+      name_tag_options[:data] = { placement: 'top' }
+      name_tag_options[:class] << 'has-tooltip'
+    end
+
+    content_tag(:span, sanitize(username), name_tag_options)
+  end
+
  def link_to_member(project, author, opts = {}, &block)
-    default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false, lazy_load: false }
+    default_opts = { avatar: true, name: true, title: ":name" }
    opts = default_opts.merge(opts)

    return "(deleted)" unless author
@@ -41,12 +59,7 @@ module ProjectsHelper
    author_html << link_to_member_avatar(author, opts) if opts[:avatar]

    # Build name span tag
-    if opts[:by_username]
-      author_html << content_tag(:span, sanitize("@#{author.username}"), class: opts[:author_class]) if opts[:name]
-    else
-      tooltip_data = { placement: 'top' }
-      author_html << content_tag(:span, sanitize(author.name), class: [opts[:author_class], ('has-tooltip' if opts[:tooltip])], title: (author.to_reference if opts[:tooltip]), data: (tooltip_data if opts[:tooltip])) if opts[:name]
-    end
+    author_html << author_content_tag(author, opts) if opts[:name]

    author_html << capture(&block) if block


--- a/app/models/ci/artifact_blob.rb
+++ b/app/models/ci/artifact_blob.rb
@@ -2,7 +2,7 @@ module Ci
  class ArtifactBlob
    include BlobLike

-    EXTENTIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze
+    EXTENSIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze

    attr_reader :entry

@@ -36,17 +36,22 @@ module Ci
    def external_url(project, job)
      return unless external_link?(job)

-      components = project.full_path_components
-      components << "-/jobs/#{job.id}/artifacts/file/#{path}"
-      artifact_path = components[1..-1].join('/')
+      full_path_parts = project.full_path_components
+      top_level_group = full_path_parts.shift

-      "#{pages_config.protocol}://#{components[0]}.#{pages_config.host}/#{artifact_path}"
+      artifact_path = [
+        '-', *full_path_parts, '-',
+        'jobs', job.id,
+        'artifacts', path
+      ].join('/')
+
+      "#{pages_config.protocol}://#{top_level_group}.#{pages_config.host}/#{artifact_path}"
    end

    def external_link?(job)
      pages_config.enabled &&
        pages_config.artifacts_server &&
-        EXTENTIONS_SERVED_BY_PAGES.include?(File.extname(name)) &&
+        EXTENSIONS_SERVED_BY_PAGES.include?(File.extname(name)) &&
        job.project.public?
    end


--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -185,13 +185,8 @@ class User < ActiveRecord::Base
  enum dashboard: [:projects, :stars, :project_activity, :starred_project_activity, :groups, :todos]

  # User's Project preference
-  #
-  # Note: When adding an option, it MUST go on the end of the hash with a
-  # number higher than the current max. We cannot move options and/or change
-  # their numbers.
-  #
-  # We skip 0 because this was used by an option that has since been removed.
-  enum project_view: { activity: 1, files: 2 }
+  # Note: When adding an option, it MUST go on the end of the array.
+  enum project_view: [:readme, :activity, :files]

  alias_attribute :private_token, :authentication_token


--- a/app/serializers/container_tag_entity.rb
+++ b/app/serializers/container_tag_entity.rb
 class ContainerTagEntity < Grape::Entity
  include RequestAwareEntity

-  expose :name, :location, :revision, :total_size, :created_at
+  expose :name, :location, :revision, :short_revision, :total_size, :created_at

  expose :destroy_path, if: -> (*) { can_destroy? } do |tag|
-    project_registry_repository_tag_path(project, tag.repository, tag.name, format: :json)
+    project_registry_repository_tag_path(project, tag.repository, tag.name)
  end

  private

--- a/app/serializers/submodule_entity.rb
+++ b/app/serializers/submodule_entity.rb
@@ -7,7 +7,7 @@ class SubmoduleEntity < Grape::Entity
    'archive'
  end

-  expose :project_url do |blob|
+  expose :url do |blob|
    submodule_links(blob, request).first
  end


--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -52,7 +52,7 @@ module Projects
    end

    def wiki_path
-      repo_path + '.wiki'
+      project.wiki.disk_path
    end

    def trash_repositories!

--- a/app/services/users/last_push_event_service.rb
+++ b/app/services/users/last_push_event_service.rb
@@ -16,8 +16,8 @@ module Users
        user_cache_key
      ]

-      if event.project.forked?
-        keys << project_cache_key(event.project.forked_from_project)
+      if forked_from = event.project.forked_from_project
+        keys << project_cache_key(forked_from)
      end

      keys.each { |key| set_key(key, event.id) }

--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -44,4 +44,4 @@
            = render "discussions/diff_with_notes", discussion: discussion
          - else
            .panel.panel-default
-              = render "discussions/notes", discussion: discussion
+              = render partial: "discussions/notes", locals: { discussion: discussion, disable_collapse_class: true }
--- a/app/views/discussions/_parallel_diff_discussion.html.haml
+++ b/app/views/discussions/_parallel_diff_discussion.html.haml
@@ -4,7 +4,7 @@
    %td.notes_line.old
    %td.notes_content.parallel.old
      .content{ class: ('hide' unless discussions_left.any?(&:expanded?)) }
-        = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old'
+        = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old', locals: { disable_collapse_class: true }
  - else
    %td.notes_line.old= ("")
    %td.notes_content.parallel.old
@@ -14,7 +14,7 @@
    %td.notes_line.new
    %td.notes_content.parallel.new
      .content{ class: ('hide' unless discussions_right.any?(&:expanded?)) }
-        = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new'
+        = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new', locals: { disable_collapse_class: true }
  - else
    %td.notes_line.new= ("")
    %td.notes_content.parallel.new

--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -20,13 +20,6 @@

  = render 'shared/issuable/search_bar', type: :issues

-  .row-content-block.second-block
-    Only issues from the
-    %strong= @group.name
-    group are listed here.
-    - if current_user
-      To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
-
  = render 'shared/issues'
 - else
  = render 'shared/empty_states/issues', project_select_button: true
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -15,11 +15,4 @@

  = render 'shared/issuable/search_bar', type: :merge_requests

-  .row-content-block.second-block
-    Only merge requests from
-    %strong= @group.name
-    group are listed here.
-    - if current_user
-      To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
-
  = render 'shared/merge_requests'
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -37,7 +37,7 @@
  - if content_for?(:library_javascripts)
    = yield :library_javascripts

-  = javascript_include_tag asset_path("locale/#{I18n.locale.to_s || I18n.default_locale.to_s}/app.js") unless I18n.locale == :en
+  = javascript_include_tag locale_path unless I18n.locale == :en
  = webpack_bundle_tag "webpack_runtime"
  = webpack_bundle_tag "common"
  = webpack_bundle_tag "main"

--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -288,6 +288,11 @@
              = sprite_icon('users')
            %span.nav-item-name
              Members
+          %ul.sidebar-sub-level-items.is-fly-out-only
+            = nav_link(path: %w[members#show], html_options: { class: "fly-out-top-item" } ) do
+              = link_to project_settings_members_path(@project) do
+                %strong.fly-out-top-item-name
+                  #{ _('Members') }

      = render 'shared/sidebar_toggle_button'


--- a/app/views/peek/views/_gitaly.html.haml
+++ b/app/views/peek/views/_gitaly.html.haml
+- local_assigns.fetch(:view)
+
+%strong
+  %span{ data: { defer_to: "#{view.defer_key}-duration" } } ...
+  \/
+  %span{ data: { defer_to: "#{view.defer_key}-calls" } } ...
+  Gitaly
--- a/app/views/projects/_readme.html.haml
+++ b/app/views/projects/_readme.html.haml
+- if (readme = @repository.readme) && readme.rich_viewer
+  %article.file-holder.readme-holder{ id: 'readme', class: ("limited-width-container" unless fluid_layout) }
+    .js-file-title.file-title
+      = blob_icon readme.mode, readme.name
+      = link_to project_blob_path(@project, tree_join(@ref, readme.path)) do
+        %strong
+          = readme.name
+    = render 'projects/blob/viewer', viewer: readme.rich_viewer, viewer_url: namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path), viewer: :rich, format: :json)
+
+- else
+  .row-content-block.second-block.center
+    %h3.page-title
+      This project does not have a README yet
+    - if can?(current_user, :push_code, @project)
+      %p
+        A
+        %code README
+        file contains information about other files in a repository and is commonly
+        distributed with computer software, forming part of its documentation.
+      %p
+        We recommend you to
+        = link_to "add a README", add_special_file_path(@project, file_name: 'README.md'), class: 'underlined-link'
+        file to the repository and GitLab will render it here instead of this message.
--- a/app/views/projects/clusters/login.html.haml
+++ b/app/views/projects/clusters/login.html.haml
@@ -10,7 +10,7 @@
  .col-sm-8.col-sm-offset-4.signin-with-google
    - if @authorize_url
      = link_to @authorize_url do
-        = image_tag('auth_buttons/signin_with_google.png')
+        = image_tag('auth_buttons/signin_with_google.png', width: '191px')
    - else
      - link = link_to(s_('ClusterIntegration|properly configured'), help_page_path("integration/google"), target: '_blank', rel: 'noopener noreferrer')
      = s_('Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_to_documentation: link }
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
 .tree-ref-container
  .tree-ref-holder
-    = render 'shared/ref_switcher', destination: 'tree', path: @path
+    = render 'shared/ref_switcher', destination: 'tree', path: @path, show_create: true

  - unless show_new_repo?
    = render 'projects/tree/old_tree_header'

--- a/app/views/shared/_ref_switcher.html.haml
+++ b/app/views/shared/_ref_switcher.html.haml
+- show_new_branch_form = show_new_repo? && show_create && can?(current_user, :push_code, @project)
 - dropdown_toggle_text = @ref || @project.default_branch
 = form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form" do
  = hidden_field_tag :destination, destination
@@ -7,8 +8,20 @@
    = hidden_field_tag key, value, id: nil
  .dropdown
    = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project), field_name: 'ref', submit_form_on_click: true, visit: true }, { toggle_class: "js-project-refs-dropdown" }
-    .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
-      = dropdown_title _("Switch branch/tag")
-      = dropdown_filter _("Search branches and tags")
-      = dropdown_content
-      = dropdown_loading
+    .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
+      .dropdown-page-one
+        = dropdown_title _("Switch branch/tag")
+        = dropdown_filter _("Search branches and tags")
+        = dropdown_content
+        = dropdown_loading
+        - if show_new_branch_form
+          = dropdown_footer do
+            %ul.dropdown-footer-list
+              %li
+                %a.dropdown-toggle-page{ href: "#" }
+                  Create new branch
+      - if show_new_branch_form
+        .dropdown-page-two
+          = dropdown_title("Create new branch", options: { back: true })
+          = dropdown_content do
+            .js-new-branch-dropdown
--- a/app/views/shared/icons/_icon_autodevops.svg
+++ b/app/views/shared/icons/_icon_autodevops.svg
--- a/app/views/shared/issuable/_participants.html.haml
+++ b/app/views/shared/issuable/_participants.html.haml
@@ -14,5 +14,5 @@
        = link_to_member(@project, participant, name: false, size: 24, lazy_load: true)
  - if participants_extra > 0
    .hide-collapsed.participants-more
-      %a.js-participants-more{ href: "#", data: { original_text: "+ #{participants_size - 7} more", less_text: "- show less" } }
+      %button.btn-transparent.btn-blank.js-participants-more{ type: 'button', data: { original_text: "+ #{participants_size - 7} more", less_text: "- show less" } }
        + #{participants_extra} more
--- a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml
+++ b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml
+---
+title: Decrease ABC threshold to 54.28
+merge_request: 14920
+author: Maxim Rydkin
+type: other
--- a/changelogs/unreleased/30140-restore-readme-only-preference.yml
+++ b/changelogs/unreleased/30140-restore-readme-only-preference.yml
+---
+title: Add readme only option as project view
+merge_request: 14900
+author:
+type: changed
--- a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml
+++ b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml
+---
+title: Decrease Perceived Complexity threshold to 14
+merge_request: 14231
+author: Maxim Rydkin
+type: other
--- a/changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml
+++ b/changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml
+---
+title: Get Project Branch API shows an helpful error message on invalid refname
+merge_request: 14884
+author: Jacopo Beschi @jacopo-beschi
+type: added
--- a/changelogs/unreleased/39297-remove-help-text-group-lists.yml
+++ b/changelogs/unreleased/39297-remove-help-text-group-lists.yml
+---
+title: Remove help text from group issues page and group merge requests page
+merge_request: 14963
+author:
+type: removed
--- a/changelogs/unreleased/animate-auto-devops.yml
+++ b/changelogs/unreleased/animate-auto-devops.yml
+---
+title: Animate auto devops graphic
+merge_request:
+author:
+type: other
--- a/changelogs/unreleased/bvl-fix-group-atom-feed.yml
+++ b/changelogs/unreleased/bvl-fix-group-atom-feed.yml
+---
+title: Fix the atom feed for group events
+merge_request: 14974
+author:
+type: fixed
--- a/changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml
+++ b/changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml
+---
+title: Only cache last push event for existing projects when pushing to a fork
+merge_request: 14989
+author:
+type: fixed
--- a/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml
+++ b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml
+---
+title: Get true failure from evalulate_script by checking for element beforehand
+merge_request: 14898
+author:
+type: fixed
--- a/changelogs/unreleased/fix-system-hook-docs.yml
+++ b/changelogs/unreleased/fix-system-hook-docs.yml
+---
+title: Clarify system_hook triggers in documentation
+merge_request: 14957
+author: Joe Marty
+type: other
--- a/changelogs/unreleased/multi-file-editor-submodules.yml
+++ b/changelogs/unreleased/multi-file-editor-submodules.yml
+---
+title: Added submodule support in multi-file editor
+merge_request:
+author:
+type: added
--- a/changelogs/unreleased/not-found-in-commits.yml
+++ b/changelogs/unreleased/not-found-in-commits.yml
+---
+title: Renders 404 in commits controller if no commits are found for a given path
+merge_request: 14610
+author: Guilherme Vieira
+type: fixed
--- a/changelogs/unreleased/sh-fix-container-registry-destroy.yml
+++ b/changelogs/unreleased/sh-fix-container-registry-destroy.yml
+---
+title: Fix deletion of container registry or images returning an error
+merge_request:
+author:
+type: fixed
--- a/changelogs/unreleased/tc-saml-fix-false-empty.yml
+++ b/changelogs/unreleased/tc-saml-fix-false-empty.yml
+---
+title: Fix SAML error 500 when no groups are defined for user
+merge_request: 14913
+author:
+type: fixed
--- a/changelogs/unreleased/use-title.yml
+++ b/changelogs/unreleased/use-title.yml
+---
+title: Use title as placeholder instead of issue title for reusability
+merge_request:
+author:
+type: other
--- a/changelogs/unreleased/zj-peek-gitaly.yml
+++ b/changelogs/unreleased/zj-peek-gitaly.yml
+---
+title: Add Gitaly metrics to the performance bar
+merge_request:
+author:
+type: other
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -16,6 +16,7 @@ Peek.into Peek::Views::Redis
 Peek.into Peek::Views::Sidekiq
 Peek.into Peek::Views::Rblineprof
 Peek.into Peek::Views::GC
+Peek.into Peek::Views::Gitaly

 # rubocop:disable Style/ClassAndModuleCamelCase
 class PEEK_DB_CLIENT

--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -316,8 +316,13 @@ constraints(ProjectUrlConstrainer.new) do

      namespace :registry do
        resources :repository, only: [] do
-          resources :tags, only: [:index, :destroy],
-                           constraints: { id: Gitlab::Regex.container_registry_tag_regex }
+          # We default to JSON format in the controller to avoid ambiguity.
+          # `latest.json` could either be a request for a tag named `latest`
+          # in JSON format, or a request for tag named `latest.json`.
+          scope format: false do
+            resources :tags, only: [:index, :destroy],
+                             constraints: { id: Gitlab::Regex.container_registry_tag_regex }
+          end
        end
      end


--- a/doc/README.md
+++ b/doc/README.md
@@ -94,7 +94,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i

 ### Issues and Merge Requests (MRs)

- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
+- [Discussions](user/discussions/index.md): Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
 - [Issues](user/project/issues/index.md)
 - [Project issue Board](user/project/issue_board.md)
 - **(EEP)** [Group Issue Boards](user/project/issue_board.md#group-issue-boards)
@@ -175,7 +175,7 @@ have access to GitLab administration tools and settings.
 - [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): Enable Elasticsearch which powers GitLab's Advanced Global Search. Useful when you deal with a huge amount of data.

--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -18,8 +18,7 @@ other than production, the corresponding logfile is shown here.)

 It contains a structured log for Rails controller requests received from
 GitLab, thanks to [Lograge](https://github.com/roidrage/lograge/). Note that
-requests from the API [are not yet logged to this
-file](https://gitlab.com/gitlab-org/gitlab-ce/issues/36189).
+requests from the API are logged to a separate file in `api_json.log`.

 Each line contains a JSON line that can be ingested by Elasticsearch, Splunk, etc. For example:

@@ -73,6 +72,27 @@ In this example we can see that server processed an HTTP request with URL
 19:34:53 +0200. Also we can see that request was processed by
 `Projects::TreeController`.

+## `api_json.log`
+
+Introduced in GitLab 10.0, this file lives in
+`/var/log/gitlab/gitlab-rails/api_json.log` for Omnibus GitLab packages or in
+`/home/git/gitlab/log/api_json.log` for installations from source.
+
+It helps you see requests made directly to the API. For example:
+
+```json
+{"time":"2017-10-10T12:30:11.579Z","severity":"INFO","duration":16.84,"db":1.57,"view":15.27,"status":200,"method":"POST","path":"/api/v4/internal/allowed","params":{"action":"git-upload-pack","changes":"_any","gl_repository":null,"project":"root/foobar.git","protocol":"ssh","env":"{}","key_id":"[FILTERED]","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"}
+```
+
+This entry above shows an access to an internal endpoint to check whether an
+associated SSH key can download the project in question via a `git fetch` or
+`git clone`. In this example, we see:
+
+1. `method`: The HTTP method used to make the request
+1. `path`: The relative path of the query
+1. `params`: Key-value pairs passed in a query string or HTTP body. Sensitive parameters (e.g. passwords, tokens, etc.) are filtered out.
+1. `ua`: The User-Agent of the requester
+
 ## `application.log`

 This file lives in `/var/log/gitlab/gitlab-rails/application.log` for

--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -64,7 +64,21 @@ following locations:

 ## Road to GraphQL

-We have changed our plans to move to GraphQL. After reviewing the GraphQL license, anything related to the Facebook BSD plus patent license will not be allowed at GitLab.
+Going forward, we will start on moving to
+[GraphQL](http://graphql.org/learn/best-practices/) and deprecate the use of
+controller-specific endpoints. GraphQL has a number of benefits:
+
+1. We avoid having to maintain two different APIs.
+2. Callers of the API can request only what they need.
+3. It is versioned by default.
+
+It will co-exist with the current v4 REST API. If we have a v5 API, this should
+be a compatibility layer on top of GraphQL.
+
+Although there were some patenting and licensing concerns with GraphQL, these
+have been resolved to our satisfaction by the relicensing of the reference
+implementations under MIT, and the use of the OWF license for the GraphQL
+specification.

 ## Basic usage

@@ -442,6 +456,23 @@ Content-Type: application/json
 }
 ```

+## Encoding `+` in ISO 8601 dates
+
+If you need to include a `+` in a query parameter, you may need to use `%2B` instead due
+a [W3 recommendation](http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that
+causes a `+` to be interpreted as a space. For example, in an ISO 8601 date, you may want to pass
+a time in Mountain Standard Time, such as:
+
+```
+2017-10-17T23:11:13.000+05:30
+```
+
+The correct encoding for the query parameter would be:
+
+```
+2017-10-17T23:11:13.000%2B05:30
+```
+
 ## Clients

 There are many unofficial GitLab API Clients for most of the popular

--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -43,6 +43,7 @@ future GitLab releases.**
 | **CI_COMMIT_TAG**               | 9.0    | 0.5    | The commit tag name. Present only when building tags. |
 | **CI_CONFIG_PATH**              | 9.4    | 0.5    | The path to CI config file. Defaults to `.gitlab-ci.yml` |
 | **CI_DEBUG_TRACE**              | all    | 1.7    | Whether [debug tracing](#debug-tracing) is enabled |
+| **CI_DISPOSABLE_ENVIRONMENT**   | all    | 10.1   | Mark that job is executed in a disposable environment (something that is created only for this job and disposed of/destroyed after the execution - all executors except `shell` and `ssh`). If the environment is disposable, it is set to true, otherwise it is not defined at all. |
 | **CI_ENVIRONMENT_NAME**         | 8.15   | all    | The name of the environment for this job |
 | **CI_ENVIRONMENT_SLUG**         | 8.15   | all    | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. |
 | **CI_ENVIRONMENT_URL**          | 9.3    | all    | The URL of the environment for this job |
@@ -74,6 +75,7 @@ future GitLab releases.**
 | **CI_SERVER_NAME**              | all    | all    | The name of CI server that is used to coordinate jobs |
 | **CI_SERVER_REVISION**          | all    | all    | GitLab revision that is used to schedule jobs |
 | **CI_SERVER_VERSION**           | all    | all    | GitLab version that is used to schedule jobs |
+| **CI_SHARED_ENVIRONMENT**       | all    | 10.1   | Mark that job is executed in a shared environment (something that is persisted across CI invocations like `shell` or `ssh` executor). If the environment is shared, it is set to true, otherwise it is not defined at all. |
 | **ARTIFACT_DOWNLOAD_ATTEMPTS**  | 8.15   | 1.9    | Number of attempts to download artifacts running a job |
 | **GET_SOURCES_ATTEMPTS**        | 8.15   | 1.9    | Number of attempts to fetch sources running a job |
 | **GITLAB_CI**                   | all    | all    | Mark that job is executed in GitLab CI environment |

--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -95,6 +95,12 @@ be an array or a multi-line string.
 `after_script` is used to define the command that will be run after for all
 jobs. This has to be an array or a multi-line string.

+> **Note:**
+The `before_script` and the main `script` are concatenated and run in a single context/container.
+The `after_script` is run separately, so depending on the executor, changes done
+outside of the working tree might not be visible, e.g. software installed in the
+`before_script`.
+
 ### stages

 `stages` is used to define stages that can be used by jobs.

--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -71,6 +71,9 @@ Vue specific design patterns and practices.

 ---

+## [Vue Resource](vue_resource.md)
+Vue resource specific practices and gotchas.
+
 ## [Icons](icons.md)
 How we use SVG for our Icons.


--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
@@ -179,6 +179,7 @@ itself, please read this guide: [State Management][state-management]
 The Service is a class used only to communicate with the server.
 It does not store or manipulate any data. It is not aware of the store or the components.
 We use [vue-resource][vue-resource-repo] to communicate with the server.
+Refer to [vue resource](vue_resource.md) for more details.

 Vue Resource should only be imported in the service file.

@@ -189,55 +190,6 @@ Vue Resource should only be imported in the service file.
  Vue.use(VueResource);
  ```

-#### Vue-resource gotchas
-#### Headers
-Headers are being parsed into a plain object in an interceptor.
-In Vue-resource 1.x `headers` object was changed into an `Headers` object. In order to not change all old code, an interceptor was added.
-
-If you need to write a unit test that takes the headers in consideration, you need to include an interceptor to parse the headers after your test interceptor.
-You can see an example in `spec/javascripts/environments/environment_spec.js`:
-  ```javascript
-  import { headersInterceptor } from './helpers/vue_resource_helper';
-
-  beforeEach(() => {
-    Vue.http.interceptors.push(myInterceptor);
-    Vue.http.interceptors.push(headersInterceptor);
-  });
-
-  afterEach(() => {
-    Vue.http.interceptors = _.without(Vue.http.interceptors, myInterceptor);
-    Vue.http.interceptors = _.without(Vue.http.interceptors, headersInterceptor);
-  });
-  ```
-
-#### `.json()`
-When making a request to the server, you will most likely need to access the body of the response.
-Use `.json()` to convert. Because `.json()` returns a Promise the follwoing structure should be used:
-
-  ```javascript
-  service.get('url')
-    .then(resp => resp.json())
-    .then((data) => {
-      this.store.storeData(data);
-    })
-    .catch(() => new Flash('Something went wrong'));
-  ```
-
-When using `Poll` (`app/assets/javascripts/lib/utils/poll.js`), the `successCallback` needs to handle `.json()` as a Promise:
-  ```javascript
-  successCallback: (response) => {
-    return response.json().then((data) => {
-      // handle the response
-    });
-  }
-  ```
-
-#### CSRF token
-We use a Vue Resource interceptor to manage the CSRF token.
-`app/assets/javascripts/vue_shared/vue_resource_interceptor.js` holds all our common interceptors.
-Note: You don't need to load `app/assets/javascripts/vue_shared/vue_resource_interceptor.js`
-since it's already being loaded by `common_vue.js`.
-
 ### End Result

 The following example shows an  application:
@@ -769,7 +721,6 @@ describe('component', () => {
 [component-system]: https://vuejs.org/v2/guide/#Composing-with-Components
 [state-management]: https://vuejs.org/v2/guide/state-management.html#Simple-State-Management-from-Scratch
 [one-way-data-flow]: https://vuejs.org/v2/guide/components.html#One-Way-Data-Flow
-[vue-resource-repo]: https://github.com/pagekit/vue-resource
 [vue-resource-interceptor]: https://github.com/pagekit/vue-resource/blob/develop/docs/http.md#interceptors
 [vue-test]: https://vuejs.org/v2/guide/unit-testing.html
 [issue-boards-service]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/boards/services/board_service.js.es6

--- a/doc/development/fe_guide/vue_resource.md
+++ b/doc/development/fe_guide/vue_resource.md
+# Vue Resouce
+In Vue applications we use [vue-resource][vue-resource-repo] to communicate with the server.
+
+## HTTP Status Codes
+
+### `.json()`
+When making a request to the server, you will most likely need to access the body of the response.
+Use `.json()` to convert. Because `.json()` returns a Promise the follwoing structure should be used:
+
+  ```javascript
+  service.get('url')
+    .then(resp => resp.json())
+    .then((data) => {
+      this.store.storeData(data);
+    })
+    .catch(() => new Flash('Something went wrong'));
+  ```
+
+
+When using `Poll` (`app/assets/javascripts/lib/utils/poll.js`), the `successCallback` needs to handle `.json()` as a Promise:
+  ```javascript
+  successCallback: (response) => {
+    return response.json().then((data) => {
+      // handle the response
+    });
+  }
+  ```
+
+### 204
+Some endpoints - usually `delete` endpoints - return `204` as the success response.
+When handling `204 - No Content` responses, we cannot use `.json()` since it tries to parse the non-existant body content.
+
+When handling `204` responses, do not use `.json`, otherwise the promise will throw an error and will enter the `catch` statement:
+
+```javascript
+  Vue.http.delete('path')
+    .then(() => {
+      // success!
+    })
+    .catch(() => {
+      // handle error
+    })
+```
+
+## Headers
+Headers are being parsed into a plain object in an interceptor.
+In Vue-resource 1.x `headers` object was changed into an `Headers` object. In order to not change all old code, an interceptor was added.
+
+If you need to write a unit test that takes the headers in consideration, you need to include an interceptor to parse the headers after your test interceptor.
+You can see an example in `spec/javascripts/environments/environment_spec.js`:
+  ```javascript
+  import { headersInterceptor } from './helpers/vue_resource_helper';
+
+  beforeEach(() => {
+    Vue.http.interceptors.push(myInterceptor);
+    Vue.http.interceptors.push(headersInterceptor);
+  });
+
+  afterEach(() => {
+    Vue.http.interceptors = _.without(Vue.http.interceptors, myInterceptor);
+    Vue.http.interceptors = _.without(Vue.http.interceptors, headersInterceptor);
+  });
+  ```
+
+## CSRF token
+We use a Vue Resource interceptor to manage the CSRF token.
+`app/assets/javascripts/vue_shared/vue_resource_interceptor.js` holds all our common interceptors.
+Note: You don't need to load `app/assets/javascripts/vue_shared/vue_resource_interceptor.js`
+since it's already being loaded by `common_vue.js`.
+
+
+[vue-resource-repo]: https://github.com/pagekit/vue-resource
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -56,6 +56,7 @@ Libraries with the following licenses are acceptable for use:
 - [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative.
 - [Creative Commons Zero (CC0)][CC0]: A public domain dedication, recommended as a way to disclaim copyright on your work to the maximum extent possible.
 - [Unlicense][UNLICENSE]: Another public domain dedication.
+- [OWFa 1.0][OWFa1]: An open-source license and patent grant designed for specifications.

 ## Unacceptable Licenses

@@ -105,6 +106,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar
 [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL
 [Org-Repo]: https://gitlab.com/gitlab-com/organization
 [UNLICENSE]: https://unlicense.org
+[OWFa1]: http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0
 [Facebook]: https://code.facebook.com/pages/850928938376556
 [x-list]: https://www.apache.org/legal/resolved.html#category-x
 [Acceptable-Licenses]: #acceptable-licenses

--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -35,6 +35,8 @@ Here are some things to keep in mind regarding test performance:
  [Gotchas](../gotchas.md#dont-assert-against-the-absolute-value-of-a-sequence-generated-attribute)).
 - Don't supply the `:each` argument to hooks since it's the default.
 - On `before` and `after` hooks, prefer it scoped to `:context` over `:all`
+- When using `evaluate_script("$('.js-foo').testSomething()")` (or `execute_script`) which acts on a given element,
+  use a Capyabara matcher beforehand (e.g. `find('.js-foo')`) to ensure the element actually exists.

 [four-phase-test]: https://robots.thoughtbot.com/four-phase-test


--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -105,24 +105,5 @@ form. Click the icon to begin the authentication process. Google will ask the
 user to sign in and authorize the GitLab application. If everything goes well
 the user will be returned to GitLab and will be signed in.

-## Further Configuration
-
-This further configuration is not required for Google authentication to function
-but it is strongly recommended. Taking these steps will increase usability for
-users by providing a little more recognition and branding.
-
-At this point, when users first try to authenticate to your GitLab installation
-with Google they will see a generic application name on the prompt screen. The
-prompt informs the user that "Project Default Service Account" would like to
-access their account. "Project Default Service Account" isn't very recognizable
-and may confuse or cause users to be concerned. This is easily changeable:
-
-1. Select 'Consent screen' in the left menu. (See steps 1, 4 and 5 above for
-   instructions on how to get here if you closed your window).
-1. Scroll down until you find "Product Name". Change the product name to
-   something more descriptive.
-1. Add any additional information as you wish - homepage, logo, privacy policy,
-   etc. None of this is required, but it may help your users.
-
 [reconfigure]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
 [restart GitLab]: ../administration/restart_gitlab.md#installations-from-source
--- a/doc/integration/trello_power_up.md
+++ b/doc/integration/trello_power_up.md
@@ -39,4 +39,4 @@ Learn more about generating a personal access token in the
 [Personal Access Token Documentation][personal-access-token-documentation].
 Don't forget to check the API scope checkbox!

-[personal-access-token-documentation]: ../user/profile/personal_access_tokens.html
+[personal-access-token-documentation]: ../user/profile/personal_access_tokens.md
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
+# GitLab Maintenance Policy
+
+## Versioning
+
+GitLab follows the [Semantic Versioning](http://semver.org/) for its releases:
+`(Major).(Minor).(Patch)` in a [pragmatic way].
+
+- **Major version**: Whenever there is something significant or any backwards
+  incompatible changes are introduced to the public API.
+- **Minor version**: When new, backwards compatible functionality is introduced
+  to the public API or a minor feature is introduced, or when a set of smaller
+  features is rolled out.
+- **Patch number**: When backwards compatible bug fixes are introduced that fix
+  incorrect behavior.
+
+For example, for GitLab version 10.5.7:
+
+* `10` represents major version
+* `5` represents minor version
+* `7` represents patch number
+
+## Security releases
+
+The current stable release will receive security patches and bug fixes
+(eg. `8.9.0` -> `8.9.1`).
+
+Feature releases will mark the next supported stable
+release where the minor version is increased numerically by increments of one
+(eg. `8.9 -> 8.10`).
+
+Our current policy is to support one stable release at any given time.
+For medium-level security issues, we may consider backporting to the previous two
+monthly releases.
+
+For very serious security issues, there is [precedent](https://about.gitlab.com/2016/05/02/cve-2016-4340-patches/)
+to backport security fixes to even more monthly releases of GitLab. This decision
+is made on a case-by-case basis.
+
+## Version support
+
+We encourage everyone to run the latest stable release to ensure that you can
+easily upgrade to the most secure and feature-rich GitLab experience. In order
+to make sure you can easily run the most recent stable release, we are working
+hard to keep the update process simple and reliable.
+
+If you are unable to follow our monthly release cycle, there are a couple of
+cases you need to consider.
+
+It is considered safe to jump between patch versions and minor versions within
+one major version. For example, it is safe to:
+
+* Upgrade the patch version:
+  * `8.9.0` -> `8.9.7`
+  * `8.9.0` -> `8.9.1`
+  * `8.9.2` -> `8.9.6`
+* Upgrade the minor version:
+  * `8.9.4` -> `8.12.3`
+  * `9.2.3` -> `9.5.5`
+
+Upgrading the major version requires more attention.
+We cannot guarantee that upgrading between major versions will be seamless. As previously mentioned, major versions are reserved for backwards incompatible changes.
+
+We recommend that you first upgrade to the latest available minor version within
+your major version. By doing this, you can address any deprecation messages
+that could possibly change behaviour in the next major release.
+
+Please see the table below for some examples:
+
+| Latest stable version | Your version | Recommended upgrade path | Note |
+| -------------- | ------------ | ------------------------ | ---------------- |
+| 9.4.5   | 8.13.4   | `8.13.4` -> `8.17.7` -> `9.4.5`     | `8.17.7` is the last version in version `8` |
+| 10.1.4   | 8.13.4   | `8.13.4` -> `8.17.7` -> `9.5.8` -> `10.1.4` | `8.17.7` is the last version in version `8`, `9.5.8` is the last version in version `9` |
+|
+
+More information about the release procedures can be found in our
+[release-tools documentation][rel]. You may also want to read our
+[Responsible Disclosure Policy][disclosure].
+
+[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/
+[disclosure]: https://about.gitlab.com/disclosure/
+[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e
--- a/doc/system_hooks/system_hooks.md
+++ b/doc/system_hooks/system_hooks.md
@@ -2,6 +2,8 @@

 Your GitLab instance can perform HTTP POST requests on the following events: `project_create`, `project_destroy`, `project_rename`, `project_transfer`, `project_update`, `user_add_to_team`, `user_remove_from_team`, `user_create`, `user_destroy`, `key_create`, `key_destroy`, `group_create`, `group_destroy`, `user_add_to_group` and `user_remove_from_group`.

+The triggers for most of these are self-explanatory, but `project_update` and `project_rename` deserve some clarification: `project_update` is fired any time an attribute of a project is changed (name, description, tags, etc.) *unless* the `path` attribute is also changed. In that case, a `project_rename` is triggered instead (so that, for instance, if all you care about is the repo URL, you can just listen for `project_rename`).
+
 System hooks can be used, e.g. for logging or changing information in a LDAP server.

 > **Note:**

--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
--- a/lib/github/import.rb
+++ b/lib/github/import.rb
--- a/lib/gitlab/encoding_helper.rb
+++ b/lib/gitlab/encoding_helper.rb
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
--- a/lib/gitlab/gitaly_client/wiki_service.rb
+++ b/lib/gitlab/gitaly_client/wiki_service.rb
--- a/lib/gitlab/github_import/wiki_formatter.rb
+++ b/lib/gitlab/github_import/wiki_formatter.rb
--- a/lib/gitlab/saml/auth_hash.rb
+++ b/lib/gitlab/saml/auth_hash.rb
--- a/lib/peek/views/gitaly.rb
+++ b/lib/peek/views/gitaly.rb
--- a/lib/tasks/gitlab/dev.rake
+++ b/lib/tasks/gitlab/dev.rake
--- a/scripts/trigger-build-omnibus
+++ b/scripts/trigger-build-omnibus
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
--- a/spec/features/ci_lint_spec.rb
+++ b/spec/features/ci_lint_spec.rb
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
--- a/spec/features/issues/issue_detail_spec.rb
+++ b/spec/features/issues/issue_detail_spec.rb
--- a/spec/features/issues/markdown_toolbar_spec.rb
+++ b/spec/features/issues/markdown_toolbar_spec.rb
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
--- a/spec/features/projects/ref_switcher_spec.rb
+++ b/spec/features/projects/ref_switcher_spec.rb
--- a/spec/features/projects/user_creates_files_spec.rb
+++ b/spec/features/projects/user_creates_files_spec.rb
--- a/spec/features/projects/user_edits_files_spec.rb
+++ b/spec/features/projects/user_edits_files_spec.rb
--- a/spec/fixtures/api/schemas/registry/tag.json
+++ b/spec/fixtures/api/schemas/registry/tag.json
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
--- a/spec/javascripts/blob/blob_file_dropzone_spec.js
+++ b/spec/javascripts/blob/blob_file_dropzone_spec.js
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
--- a/spec/javascripts/pipelines/pipelines_table_row_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_row_spec.js
--- a/spec/javascripts/pipelines/pipelines_table_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_spec.js
--- a/spec/javascripts/registry/mock_data.js
+++ b/spec/javascripts/registry/mock_data.js
--- a/spec/javascripts/repo/components/new_branch_form_spec.js
+++ b/spec/javascripts/repo/components/new_branch_form_spec.js
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
--- a/spec/javascripts/repo/components/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
--- a/spec/javascripts/repo/components/repo_spec.js
+++ b/spec/javascripts/repo/components/repo_spec.js
--- a/spec/javascripts/repo/mock_data.js
+++ b/spec/javascripts/repo/mock_data.js
--- a/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
+++ b/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
--- a/spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
+++ b/spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/javascripts/zen_mode_spec.js
--- a/spec/lib/gitlab/encoding_helper_spec.rb
+++ b/spec/lib/gitlab/encoding_helper_spec.rb
--- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
--- a/spec/lib/gitlab/saml/auth_hash_spec.rb
+++ b/spec/lib/gitlab/saml/auth_hash_spec.rb
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
--- a/spec/migrations/migrate_user_project_view_spec.rb
+++ b/spec/migrations/migrate_user_project_view_spec.rb
--- a/spec/models/ci/artifact_blob_spec.rb
+++ b/spec/models/ci/artifact_blob_spec.rb
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
--- a/spec/requests/api/v3/groups_spec.rb
+++ b/spec/requests/api/v3/groups_spec.rb
--- a/spec/serializers/container_tag_entity_spec.rb
+++ b/spec/serializers/container_tag_entity_spec.rb
--- a/spec/services/users/last_push_event_service_spec.rb
+++ b/spec/services/users/last_push_event_service_spec.rb
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
--- a/spec/support/ldap_helpers.rb
+++ b/spec/support/ldap_helpers.rb
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
--- a/spec/support/select2_helper.rb
+++ b/spec/support/select2_helper.rb
--- a/spec/support/shared_examples/requests/api/status_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/status_shared_examples.rb