Merge remote-tracking branch 'upstream/master' into show-commit-status-from-source-project

* upstream/master: (409 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...

Merge remote-tracking branch 'upstream/master' into show-commit-status-from-source-project
* upstream/master: (409 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...
68f964ad · Lin Jen-Shin · a04e9f9b · 4e6af0c3 · 68f964ad · 68f964ad
Commit 68f964ad authored Oct 18, 2016 by Lin Jen-Shin
609 changed files
--- a/.gitattributes
+++ b/.gitattributes
-CHANGELOG merge=union
+CHANGELOG.md merge=union
 *.js.es6 gitlab-language=javascript
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,12 +19,10 @@ variables:
 before_script:
  - source ./scripts/prepare_build.sh
  - cp config/gitlab.yml.example config/gitlab.yml
-  - mkdir -p tmp/tests
-  - mount -t tmpfs tmpfs tmp/tests || echo "tmpfs mount failed, falling back to disc"
  - bundle --version
  - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"'
  - retry gem install knapsack
-  - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
+  - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql'
 stages:
 - prepare
@@ -101,7 +99,7 @@ update-knapsack:
    - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
    - export KNAPSACK_GENERATE_REPORT=true
    - cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
-    - knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
+    - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
  artifacts:
    expire_in: 31d
    paths:
@@ -212,6 +210,13 @@ rake brakeman: *exec
 rake flay: *exec
 license_finder: *exec
 rake downtime_check: *exec
+rake ce_to_ee_merge_check:
+  <<: *exec
+  only:
+    - branches
+  except:
+    - tags
+  allow_failure: yes
 rake db:migrate:reset:
  stage: test
@@ -257,6 +262,12 @@ lint-doc:
  script:
    - scripts/lint-doc.sh
+bundler:check:
+ stage: test
+ <<: *ruby-static-analysis
+ script:
+   - bundle check
 bundler:audit:
  stage: test
  <<: *ruby-static-analysis
@@ -295,6 +306,17 @@ coverage:
    - coverage/index.html
    - coverage/assets/
+# Trigger docs build
+trigger_docs:
+  stage: post-test
+  before_script: []
+  cache: {}
+  artifacts: {}
+  script:
+    - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master https://gitlab.com/api/v3/projects/38069/trigger/builds"
+  only:
+    - master
 # Notify slack in the end
 notify:slack:
@@ -327,3 +349,16 @@ pages:
      - public
  only:
    - master
+# Insurance in case a gem needed by one of our releases gets yanked from
+# rubygems.org in the future.
+cache gems:
+  only:
+    - tags
+  variables:
+    SETUP_DB: "false"
+  script:
+    - bundle package --all --all-platforms
+  artifacts:
+    paths:
+      - vendor/cache
--- a/.gitlab/merge_request_templates/Documentation.md
+++ b/.gitlab/merge_request_templates/Documentation.md
-See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html.
+See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
 ## What does this MR do?

--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -61,7 +61,7 @@ linters:
  # Separate rule, function, and mixin declarations with empty lines.
  EmptyLineBetweenBlocks:
-    enabled: false
+    enabled: true
  # Reports when you have an empty rule set.
  EmptyRule:
@@ -219,7 +219,7 @@ linters:
  # Property values, @extend, @include, and @import directives, and variable
  # declarations should always end with a semicolon.
  TrailingSemicolon:
-    enabled: false
+    enabled: true
  # Reports lines containing trailing whitespace.
  TrailingWhitespace:

--- a/.vagrant_enabled
+++ b/.vagrant_enabled
--- a/CHANGELOG
+++ b/CHANGELOG
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -247,7 +247,7 @@ request is as follows:
 1. Fork the project into your personal space on GitLab.com
 1. Create a feature branch, branch away from `master`
 1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
-1. Add your changes to the [CHANGELOG](CHANGELOG):
+1. Add your changes to the [CHANGELOG.md](CHANGELOG.md):
  1. If you are fixing a ~regression issue, you can add your entry to the next
     patch release (e.g. `8.12.5` if current version is `8.12.4`)
  1. Otherwise, add your entry to the next minor release (e.g. `8.13.0` if

--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-3.6.4
+3.6.6
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-0.8.4
+0.8.5
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ gem 'browser', '~> 2.2'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.6.7'
+gem 'gitlab_git', '~> 10.6.8'
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5'
 # Markdown and HTML processing
 gem 'html-pipeline',      '~> 1.11.0'
 gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
-gem 'github-markup',      '~> 1.4'
+gem 'gitlab-markup',      '~> 1.5.0'
 gem 'redcarpet',          '~> 3.3.3'
 gem 'RedCloth',           '~> 4.3.2'
 gem 'rdoc',               '~>3.6'
@@ -225,7 +225,7 @@ gem 'gon',                '~> 6.1.0'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 4.1.0'
 gem 'jquery-ui-rails',    '~> 5.0.0'
-gem 'request_store',      '~> 1.3.0'
+gem 'request_store',      '~> 1.3'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
@@ -308,6 +308,8 @@ group :development, :test do
  gem 'license_finder', '~> 2.1.0', require: false
  gem 'knapsack', '~> 1.11.0'
+  gem 'activerecord_sane_schema_dumper', '0.2'
 end
 group :test do
@@ -324,7 +326,7 @@ gem 'newrelic_rpm', '~> 3.16'
 gem 'octokit', '~> 4.3.0'
-gem 'mail_room', '~> 0.8'
+gem 'mail_room', '~> 0.8.1'
 gem 'email_reply_parser', '~> 0.5.8'
@@ -341,7 +343,7 @@ gem 'oauth2', '~> 1.2.0'
 gem 'paranoia', '~> 2.0'
 # Health check
-gem 'health_check', '~> 2.1.0'
+gem 'health_check', '~> 2.2.0'
 # System information
 gem 'vmstat', '~> 2.2'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,8 @@ GEM
      multi_json (~> 1.11, >= 1.11.2)
      rack (>= 1.5.2, < 3)
      railties (>= 4.0, < 5.1)
+    activerecord_sane_schema_dumper (0.2)
+      rails (>= 4, < 5)
    activesupport (4.2.7.1)
      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
@@ -280,7 +282,8 @@ GEM
      diff-lcs (~> 1.1)
      mime-types (>= 1.16, < 3)
      posix-spawn (~> 0.3)
-    gitlab_git (10.6.7)
+    gitlab-markup (1.5.0)
+    gitlab_git (10.6.8)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.7.3)
      github-linguist (~> 4.7.0)
@@ -334,7 +337,7 @@ GEM
      thor
      tilt
    hashie (3.4.4)
-    health_check (2.1.0)
+    health_check (2.2.1)
      rails (>= 4.0)
    hipchat (1.5.2)
      httparty
@@ -399,7 +402,7 @@ GEM
      systemu (~> 2.6.2)
    mail (2.6.4)
      mime-types (>= 1.16, < 4)
-    mail_room (0.8.0)
+    mail_room (0.8.1)
    method_source (0.8.2)
    mime-types (2.99.3)
    mimemagic (0.3.0)
@@ -805,6 +808,7 @@ DEPENDENCIES
  RedCloth (~> 4.3.2)
  ace-rails-ap (~> 4.1.0)
  activerecord-session_store (~> 1.0.0)
+  activerecord_sane_schema_dumper (= 0.2)
  acts-as-taggable-on (~> 4.0)
  addressable (~> 2.3.8)
  after_commit_queue (~> 1.3.0)
@@ -861,9 +865,9 @@ DEPENDENCIES
  gemnasium-gitlab-service (~> 0.2)
  gemojione (~> 3.0)
  github-linguist (~> 4.7.0)
-  github-markup (~> 1.4)
  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab_git (~> 10.6.7)
+  gitlab-markup (~> 1.5.0)
+  gitlab_git (~> 10.6.8)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.2)
  gollum-rugged_adapter (~> 0.4.2)
@@ -872,7 +876,7 @@ DEPENDENCIES
  grape-entity (~> 0.4.2)
  haml_lint (~> 0.18.2)
  hamlit (~> 2.6.1)
-  health_check (~> 2.1.0)
+  health_check (~> 2.2.0)
  hipchat (~> 1.5.0)
  html-pipeline (~> 1.11.0)
  httparty (~> 0.13.3)
@@ -889,7 +893,7 @@ DEPENDENCIES
  license_finder (~> 2.1.0)
  licensee (~> 8.0.0)
  loofah (~> 2.0.3)
-  mail_room (~> 0.8)
+  mail_room (~> 0.8.1)
  method_source (~> 0.8)
  minitest (~> 5.7.0)
  mousetrap-rails (~> 1.4.6)
@@ -934,7 +938,7 @@ DEPENDENCIES
  redis (~> 3.2)
  redis-namespace (~> 1.5.2)
  redis-rails (~> 4.0.0)
-  request_store (~> 1.3.0)
+  request_store (~> 1.3)
  rerun (~> 0.11.0)
  responders (~> 2.0)
  rouge (~> 2.0)

--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -6,11 +6,10 @@
    groupProjectsPath: "/api/:version/groups/:id/projects.json",
    projectsPath: "/api/:version/projects.json?simple=true",
    labelsPath: "/:namespace_path/:project_path/labels",
-    licensePath: "/api/:version/licenses/:key",
+    licensePath: "/api/:version/templates/licenses/:key",
-    gitignorePath: "/api/:version/gitignores/:key",
+    gitignorePath: "/api/:version/templates/gitignores/:key",
-    gitlabCiYmlPath: "/api/:version/gitlab_ci_ymls/:key",
+    gitlabCiYmlPath: "/api/:version/templates/gitlab_ci_ymls/:key",
    issuableTemplatePath: "/:namespace_path/:project_path/templates/:type/:key",
    group: function(group_id, callback) {
      var url = Api.buildUrl(Api.groupPath)
        .replace(':id', group_id);

--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -28,12 +28,13 @@ $(() => {
      state: Store.state,
      loading: true,
      endpoint: $boardApp.dataset.endpoint,
+      boardId: $boardApp.dataset.boardId,
      disabled: $boardApp.dataset.disabled === 'true',
      issueLinkBase: $boardApp.dataset.issueLinkBase
    },
    init: Store.create.bind(Store),
    created () {
-      gl.boardService = new BoardService(this.endpoint);
+      gl.boardService = new BoardService(this.endpoint, this.boardId);
    },
    ready () {
      Store.disabled = this.disabled;

--- a/app/assets/javascripts/boards/services/board_service.js.es6
+++ b/app/assets/javascripts/boards/services/board_service.js.es6
 class BoardService {
-  constructor (root) {
+  constructor (root, boardId) {
    Vue.http.options.root = root;
-    this.lists = Vue.resource(`${root}/lists{/id}`, {}, {
+    this.lists = Vue.resource(`${root}/${boardId}/lists{/id}`, {}, {
      generate: {
        method: 'POST',
-        url: `${root}/lists/generate.json`
+        url: `${root}/${boardId}/lists/generate.json`
      }
    });
-    this.issue = Vue.resource(`${root}/issues{/id}`, {});
+    this.issue = Vue.resource(`${root}/${boardId}/issues{/id}`, {});
-    this.issues = Vue.resource(`${root}/lists{/id}/issues`, {});
+    this.issues = Vue.resource(`${root}/${boardId}/lists{/id}/issues`, {});
    Vue.http.interceptors.push((request, next) => {
      request.headers['X-CSRF-Token'] = $.rails.csrfToken();

--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -15,18 +15,17 @@
      this.hideSidebar = bind(this.hideSidebar, this);
      this.toggleSidebar = bind(this.toggleSidebar, this);
      this.updateDropdown = bind(this.updateDropdown, this);
+      this.$document = $(document);
      clearInterval(Build.interval);
      // Init breakpoint checker
      this.bp = Breakpoints.get();
-      $('.js-build-sidebar').niceScroll();
+      this.initSidebar();
      this.populateJobs(this.build_stage);
      this.updateStageDropdownText(this.build_stage);
-      this.hideSidebar();
-      $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
      $(window).off('resize.build').on('resize.build', this.hideSidebar);
-      $(document).off('click', '.stage-item').on('click', '.stage-item', this.updateDropdown);
+      this.$document.off('click', '.stage-item').on('click', '.stage-item', this.updateDropdown);
      $('#js-build-scroll > a').off('click').on('click', this.stepTrace);
      this.updateArtifactRemoveDate();
      if ($('#build-trace').length) {
@@ -62,6 +61,21 @@
      }
    }
+    Build.prototype.initSidebar = function() {
+      this.$sidebar = $('.js-build-sidebar');
+      this.sidebarTranslationLimits = {
+        min: $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight()
+      }
+      this.sidebarTranslationLimits.max = this.sidebarTranslationLimits.min + $('.scrolling-tabs-container').outerHeight();
+      this.$sidebar.css({
+        top: this.sidebarTranslationLimits.max
+      });
+      this.$sidebar.niceScroll();
+      this.hideSidebar();
+      this.$document.off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
+      this.$document.off('scroll.translateSidebar').on('scroll.translateSidebar', this.translateSidebar.bind(this));
+    };
    Build.prototype.getInitialBuildTrace = function() {
      var removeRefreshStatuses = ['success', 'failed', 'canceled', 'skipped']
@@ -129,15 +143,23 @@
    Build.prototype.toggleSidebar = function() {
      if (this.shouldHideSidebar()) {
-        return $('.js-build-sidebar').toggleClass('right-sidebar-expanded right-sidebar-collapsed');
+        return this.$sidebar.toggleClass('right-sidebar-expanded right-sidebar-collapsed');
      }
    };
+    Build.prototype.translateSidebar = function(e) {
+      var newPosition = this.sidebarTranslationLimits.max - document.body.scrollTop;
+      if (newPosition < this.sidebarTranslationLimits.min) newPosition = this.sidebarTranslationLimits.min;
+      this.$sidebar.css({
+        top: newPosition
+      });
+    };
    Build.prototype.hideSidebar = function() {
      if (this.shouldHideSidebar()) {
-        return $('.js-build-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+        return this.$sidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
      } else {
-        return $('.js-build-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
+        return this.$sidebar.removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
      }
    };

--- a/app/assets/javascripts/compare_autocomplete.js
+++ b/app/assets/javascripts/compare_autocomplete.js
@@ -9,7 +9,10 @@
        var $dropdown, selected;
        $dropdown = $(this);
        selected = $dropdown.data('selected');
-        return $dropdown.glDropdown({
+        const $dropdownContainer = $dropdown.closest('.dropdown');
+        const $fieldInput = $(`input[name="${$dropdown.data('field-name')}"]`, $dropdownContainer);
+        const $filterInput = $('input[type="search"]', $dropdownContainer);
+        $dropdown.glDropdown({
          data: function(term, callback) {
            return $.ajax({
              url: $dropdown.data('refs-url'),
@@ -42,6 +45,14 @@
            return $el.text().trim();
          }
        });
+        $filterInput.on('keyup', (e) => {
+          const keyCode = e.keyCode || e.which;
+          if (keyCode !== 13) return;
+          const text = $filterInput.val();
+          $fieldInput.val(text);
+          $('.dropdown-toggle-text', $dropdown).text(text);
+          $dropdownContainer.removeClass('open');
+        });
      });
    };

--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -8,6 +8,7 @@
  Dispatcher = (function() {
    function Dispatcher() {
      this.initSearch();
+      this.initFieldErrors();
      this.initPageScripts();
    }
@@ -20,7 +21,11 @@
      path = page.split(':');
      shortcut_handler = null;
      switch (page) {
+        case 'sessions:new':
+          new UsernameValidator();
+          break;
        case 'projects:boards:show':
+        case 'projects:boards:index':
          shortcut_handler = new ShortcutsNavigation();
          break;
        case 'projects:merge_requests:index':
@@ -45,7 +50,7 @@
        case 'projects:milestones:new':
        case 'projects:milestones:edit':
          new ZenMode();
-          new DueDateSelect();
+          new gl.DueDateSelectors();
          new GLForm($('.milestone-form'));
          break;
        case 'groups:milestones:new':
@@ -96,9 +101,6 @@
          new ZenMode();
          new MergedButtons();
          break;
-        case "projects:merge_requests:conflicts":
-          window.mcui = new MergeConflictResolver()
-          break;
        case 'projects:merge_requests:index':
          shortcut_handler = new ShortcutsNavigation();
          Issuable.init();
@@ -126,6 +128,9 @@
            new TreeView();
          }
          break;
+        case 'projects:pipelines:show':
+          new gl.Pipelines();
+          break;
        case 'groups:activity':
          new Activities();
          break;
@@ -136,12 +141,12 @@
          break;
        case 'groups:group_members:index':
          new gl.MemberExpirationDate();
-          new GroupMembers();
+          new gl.Members();
          new UsersSelect();
          break;
        case 'projects:project_members:index':
          new gl.MemberExpirationDate();
-          new ProjectMembers();
+          new gl.Members();
          new UsersSelect();
          break;
        case 'groups:new':
@@ -287,6 +292,12 @@
      }
    };
+    Dispatcher.prototype.initFieldErrors = function() {
+      $('.show-gl-field-errors').each((i, form) => {
+        new gl.GlFieldErrors(form);
+      });
+    };
    return Dispatcher;
  })();

--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
-(function() {
-  this.DueDateSelect = (function() {
-    function DueDateSelect() {
-      var $datePicker, $dueDate, $loading;
-      // Milestone edit/new form
-      $datePicker = $('.datepicker');
-      if ($datePicker.length) {
-        $dueDate = $('#milestone_due_date');
-        $datePicker.datepicker({
-          dateFormat: 'yy-mm-dd',
-          onSelect: function(dateText, inst) {
-            return $dueDate.val(dateText);
-          }
-        }).datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()));
-      }
-      $('.js-clear-due-date').on('click', function(e) {
-        e.preventDefault();
-        return $.datepicker._clearDate($datePicker);
-      });
-      // Issuable sidebar
-      $loading = $('.js-issuable-update .due_date').find('.block-loading').hide();
-      $('.js-due-date-select').each(function(i, dropdown) {
-        var $block, $dropdown, $dropdownParent, $selectbox, $sidebarValue, $value, $valueContent, abilityName, addDueDate, fieldName, issueUpdateURL;
-        $dropdown = $(dropdown);
-        $dropdownParent = $dropdown.closest('.dropdown');
-        $datePicker = $dropdownParent.find('.js-due-date-calendar');
-        $block = $dropdown.closest('.block');
-        $selectbox = $dropdown.closest('.selectbox');
-        $value = $block.find('.value');
-        $valueContent = $block.find('.value-content');
-        $sidebarValue = $('.js-due-date-sidebar-value', $block);
-        fieldName = $dropdown.data('field-name');
-        abilityName = $dropdown.data('ability-name');
-        issueUpdateURL = $dropdown.data('issue-update');
-        $dropdown.glDropdown({
-          hidden: function() {
-            $selectbox.hide();
-            return $value.css('display', '');
-          }
-        });
-        addDueDate = function(isDropdown) {
-          var data, date, mediumDate, value;
-          // Create the post date
-          value = $("input[name='" + fieldName + "']").val();
-          if (value !== '') {
-            date = new Date(value.replace(new RegExp('-', 'g'), ','));
-            mediumDate = $.datepicker.formatDate('M d, yy', date);
-          } else {
-            mediumDate = 'No due date';
-          }
-          data = {};
-          data[abilityName] = {};
-          data[abilityName].due_date = value;
-          return $.ajax({
-            type: 'PUT',
-            url: issueUpdateURL,
-            data: data,
-            dataType: 'json',
-            beforeSend: function() {
-              var cssClass;
-              $loading.fadeIn();
-              if (isDropdown) {
-                $dropdown.trigger('loading.gl.dropdown');
-                $selectbox.hide();
-              }
-              $value.css('display', '');
-              cssClass = Date.parse(mediumDate) ? 'bold' : 'no-value';
-              $valueContent.html("<span class='" + cssClass + "'>" + mediumDate + "</span>");
-              $sidebarValue.html(mediumDate);
-              if (value !== '') {
-                return $('.js-remove-due-date-holder').removeClass('hidden');
-              } else {
-                return $('.js-remove-due-date-holder').addClass('hidden');
-              }
-            }
-          }).done(function(data) {
-            if (isDropdown) {
-              $dropdown.trigger('loaded.gl.dropdown');
-              $dropdown.dropdown('toggle');
-            }
-            return $loading.fadeOut();
-          });
-        };
-        $block.on('click', '.js-remove-due-date', function(e) {
-          e.preventDefault();
-          $("input[name='" + fieldName + "']").val('');
-          return addDueDate(false);
-        });
-        return $datePicker.datepicker({
-          dateFormat: 'yy-mm-dd',
-          defaultDate: $("input[name='" + fieldName + "']").val(),
-          altField: "input[name='" + fieldName + "']",
-          onSelect: function() {
-            return addDueDate(true);
-          }
-        });
-      });
-      $(document).off('click', '.ui-datepicker-header a').on('click', '.ui-datepicker-header a', function(e) {
-        return e.stopImmediatePropagation();
-      });
-    }
-    return DueDateSelect;
-  })();
-}).call(this);
--- a/app/assets/javascripts/due_date_select.js.es6
+++ b/app/assets/javascripts/due_date_select.js.es6
+(function(global) {
+  class DueDateSelect {
+    constructor({ $dropdown, $loading } = {}) {
+      const $dropdownParent = $dropdown.closest('.dropdown');
+      const $block = $dropdown.closest('.block');
+      this.$loading = $loading;
+      this.$dropdown = $dropdown;
+      this.$dropdownParent = $dropdownParent;
+      this.$datePicker = $dropdownParent.find('.js-due-date-calendar');
+      this.$block = $block;
+      this.$selectbox = $dropdown.closest('.selectbox');
+      this.$value = $block.find('.value');
+      this.$valueContent = $block.find('.value-content');
+      this.$sidebarValue = $('.js-due-date-sidebar-value', $block);
+      this.fieldName = $dropdown.data('field-name'),
+      this.abilityName = $dropdown.data('ability-name'),
+      this.issueUpdateURL = $dropdown.data('issue-update')
+      this.rawSelectedDate = null;
+      this.displayedDate = null;
+      this.datePayload = null;
+      this.initGlDropdown();
+      this.initRemoveDueDate();
+      this.initDatePicker();
+      this.initStopPropagation();
+    }
+    initGlDropdown() {
+      this.$dropdown.glDropdown({
+        hidden: () => {
+          this.$selectbox.hide();
+          this.$value.css('display', '');
+        }
+      });
+    }
+    initDatePicker() {
+      this.$datePicker.datepicker({
+        dateFormat: 'yy-mm-dd',
+        defaultDate: $("input[name='" + this.fieldName + "']").val(),
+        altField: "input[name='" + this.fieldName + "']",
+        onSelect: () => {
+          return this.saveDueDate(true);
+        }
+      });
+    }
+    initRemoveDueDate() {
+      this.$block.on('click', '.js-remove-due-date', (e) => {
+        e.preventDefault();
+        $("input[name='" + this.fieldName + "']").val('');
+        return this.saveDueDate(false);
+      });
+    }
+    initStopPropagation() {
+      $(document).off('click', '.ui-datepicker-header a').on('click', '.ui-datepicker-header a', (e) => {
+        return e.stopImmediatePropagation();
+      });
+    }
+    saveDueDate(isDropdown) {
+      this.parseSelectedDate();
+      this.prepSelectedDate();
+      this.submitSelectedDate(isDropdown);
+    }
+    parseSelectedDate() {
+      this.rawSelectedDate = $("input[name='" + this.fieldName + "']").val();
+      if (this.rawSelectedDate.length) {
+        let dateObj = new Date(this.rawSelectedDate);
+        this.displayedDate = $.datepicker.formatDate('M d, yy', dateObj);
+      } else {
+        this.displayedDate = 'No due date';
+      }
+    }
+    prepSelectedDate() {
+      const datePayload = {};
+      datePayload[this.abilityName] = {};
+      datePayload[this.abilityName].due_date = this.rawSelectedDate;
+      this.datePayload = datePayload;
+    }
+    submitSelectedDate(isDropdown) {
+      return $.ajax({
+        type: 'PUT',
+        url: this.issueUpdateURL,
+        data: this.datePayload,
+        dataType: 'json',
+        beforeSend: () => {
+          const selectedDateValue = this.datePayload[this.abilityName].due_date;
+          const displayedDateStyle = this.displayedDate !== 'No due date' ? 'bold' : 'no-value';
+          this.$loading.fadeIn();
+          if (isDropdown) {
+            this.$dropdown.trigger('loading.gl.dropdown');
+            this.$selectbox.hide();
+          }
+          this.$value.css('display', '');
+          this.$valueContent.html(`<span class='${displayedDateStyle}'>${this.displayedDate}</span>`);
+          this.$sidebarValue.html(this.displayedDate);
+          return selectedDateValue.length ?
+            $('.js-remove-due-date-holder').removeClass('hidden') :
+            $('.js-remove-due-date-holder').addClass('hidden');
+        }
+      }).done((data) => {
+        if (isDropdown) {
+          this.$dropdown.trigger('loaded.gl.dropdown');
+          this.$dropdown.dropdown('toggle');
+        }
+        return this.$loading.fadeOut();
+      });
+    }
+  }
+  class DueDateSelectors {
+    constructor() {
+      this.initMilestoneDueDate();
+      this.initIssuableSelect();
+    }
+    initMilestoneDueDate() {
+      const $datePicker = $('.datepicker');
+      if ($datePicker.length) {
+        const $dueDate = $('#milestone_due_date');
+        $datePicker.datepicker({
+          dateFormat: 'yy-mm-dd',
+          onSelect: (dateText, inst) => {
+            $dueDate.val(dateText);
+          }
+        }).datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()));
+      }
+      $('.js-clear-due-date').on('click', (e) => {
+        e.preventDefault();
+        $.datepicker._clearDate($datePicker);
+      });
+    }
+    initIssuableSelect() {
+      const $loading = $('.js-issuable-update .due_date').find('.block-loading').hide();
+      $('.js-due-date-select').each((i, dropdown) => {
+        const $dropdown = $(dropdown);
+        new DueDateSelect({
+          $dropdown,
+          $loading
+        });
+      });
+    }
+  }
+  global.DueDateSelectors = DueDateSelectors;
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -25,7 +25,7 @@
        return function(e) {
          e.preventDefault();
          e.stopPropagation();
-          return _this.input.val('').trigger('keyup').focus();
+          return _this.input.val('').trigger('input').focus();
        };
      })(this));
      // Key events
@@ -37,28 +37,16 @@
            e.preventDefault()
          }
        })
-        .on('keyup', function(e) {
+        .on('input', function() {
-          var keyCode;
-          keyCode = e.which;
-          if (ARROW_KEY_CODES.indexOf(keyCode) >= 0) {
-            return;
-          }
          if (this.input.val() !== "" && !$inputContainer.hasClass(HAS_VALUE_CLASS)) {
            $inputContainer.addClass(HAS_VALUE_CLASS);
          } else if (this.input.val() === "" && $inputContainer.hasClass(HAS_VALUE_CLASS)) {
            $inputContainer.removeClass(HAS_VALUE_CLASS);
          }
-          if (keyCode === 13 && !options.elIsInput) {
-            return false;
-          }
          // Only filter asynchronously only if option remote is set
          if (this.options.remote) {
            clearTimeout(timeout);
            return timeout = setTimeout(function() {
-              var blurField = this.shouldBlur(keyCode);
-              if (blurField && this.filterInputBlur) {
-                this.input.blur();
-              }
              return this.options.query(this.input.val(), function(data) {
                return this.options.callback(data);
              }.bind(this));
@@ -255,7 +243,7 @@
                _this.fullData = data;
                _this.parseData(_this.fullData);
                if (_this.options.filterable && _this.filter && _this.filter.input) {
-                  return _this.filter.input.trigger('keyup');
+                  return _this.filter.input.trigger('input');
                }
              };
            // Remote data
@@ -487,7 +475,7 @@
      // Triggering 'keyup' will re-render the dropdown which is not always required
      // specially if we want to keep the state of the dropdown needed for bulk-assignment
      if (!this.options.persistWhenHide) {
-        $input.trigger("keyup");
+        $input.trigger("input");
      }
      if (this.dropdown.find(".dropdown-toggle-page").length) {
        $('.dropdown-menu', this.dropdown).removeClass(PAGE_TWO_CLASS);
@@ -500,14 +488,27 @@
    // Render the full menu
    GitLabDropdown.prototype.renderMenu = function(html) {
-      var menu_html;
-      menu_html = "";
      if (this.options.renderMenu) {
-        menu_html = this.options.renderMenu(html);
+        return this.options.renderMenu(html);
      } else {
-        menu_html = $('<ul />').append(html);
+        var ul = document.createElement('ul');
+        for (var i = 0; i < html.length; i++) {
+          var el = html[i];
+          if (el instanceof jQuery) {
+            el = el.get(0);
+          }
+          if (typeof el === 'string') {
+            ul.innerHTML += el;
+          } else {
+            ul.appendChild(el);
+          }
+        }
+        return ul;
      }
-      return menu_html;
    };
    // Append the menu into the dropdown
@@ -521,7 +522,7 @@
    };
    GitLabDropdown.prototype.renderItem = function(data, group, index) {
-      var cssClass, field, fieldName, groupAttrs, html, selected, text, url, value;
+      var field, fieldName, html, selected, text, url, value;
      if (group == null) {
        group = false;
      }
@@ -529,18 +530,16 @@
        // Render the row
        index = false;
      }
-      html = "";
+      html = document.createElement('li');
-      // Divider
+      if (data === 'divider' || data === 'separator') {
-      if (data === "divider") {
+        html.className = data;
-        return "<li class='divider'></li>";
+        return html;
-      }
-      // Separator is a full-width divider
-      if (data === "separator") {
-        return "<li class='separator'></li>";
      }
      // Header
      if (data.header != null) {
-        return _.template('<li class="dropdown-header"><%- header %></li>')({ header: data.header });
+        html.className = 'dropdown-header';
+        html.innerHTML = data.header;
+        return html;
      }
      if (this.options.renderRow) {
        // Call the render function
@@ -567,24 +566,25 @@
        } else {
          text = data.text != null ? data.text : '';
        }
-        cssClass = "";
-        if (selected) {
-          cssClass = "is-active";
-        }
        if (this.highlight) {
          text = this.highlightTextMatches(text, this.filterInput.val());
        }
+        // Create the list item & the link
+        var link = document.createElement('a');
+        link.href = url;
+        link.innerHTML = text;
+        if (selected) {
+          link.className = 'is-active';
+        }
        if (group) {
-          groupAttrs = 'data-group=' + group + ' data-index=' + index;
+          link.dataset.group = group;
-        } else {
+          link.dataset.index = index;
-          groupAttrs = '';
        }
-        html = _.template('<li><a href="<%- url %>" <%- groupAttrs %> class="<%- cssClass %>"><%= text %></a></li>')({
-          url: url,
+        html.appendChild(link);
-          groupAttrs: groupAttrs,
-          cssClass: cssClass,
-          text: text
-        });
      }
      return html;
    };

--- a/app/assets/javascripts/gl_field_errors.js.es6
+++ b/app/assets/javascripts/gl_field_errors.js.es6
+((global) => {
+  /*
+   * This class overrides the browser's validation error bubbles, displaying custom
+   * error messages for invalid fields instead. To begin validating any form, add the
+   * class `show-gl-field-errors` to the form element, and ensure error messages are
+   * declared in each inputs' title attribute.
+   *
+   * Example:
+   *
+   * <form class='show-gl-field-errors'>
+   *  <input type='text' name='username' title='Username is required.'/>
+   *</form>
+   *
+    * */
+  const errorMessageClass = 'gl-field-error';
+  const inputErrorClass = 'gl-field-error-outline';
+  class GlFieldError {
+    constructor({ input, formErrors }) {
+      this.inputElement = $(input);
+      this.inputDomElement = this.inputElement.get(0);
+      this.form = formErrors;
+      this.errorMessage = this.inputElement.attr('title') || 'This field is required.';
+      this.fieldErrorElement = $(`<p class='${errorMessageClass} hide'>${ this.errorMessage }</p>`);
+      this.state = {
+        valid: false,
+        empty: true
+      };
+      this.initFieldValidation();
+    }
+    initFieldValidation() {
+      // hidden when injected into DOM
+      this.inputElement.after(this.fieldErrorElement);
+      this.inputElement.off('invalid').on('invalid', this.handleInvalidSubmit.bind(this));
+      this.scopedSiblings = this.safelySelectSiblings();
+    }
+    safelySelectSiblings() {
+      // Apply `ignoreSelector` in markup to siblings whose visibility should not be toggled with input validity
+      const ignoreSelector = '.validation-ignore';
+      const unignoredSiblings = this.inputElement.siblings(`p:not(${ignoreSelector})`);
+      const parentContainer = this.inputElement.parent('.form-group');
+      // Only select siblings when they're scoped within a form-group with one input
+      const safelyScoped = parentContainer.length && parentContainer.find('input').length === 1;
+      return safelyScoped ? unignoredSiblings : this.fieldErrorElement;
+    }
+    renderValidity() {
+      this.renderClear();
+      if (this.state.valid) {
+        return this.renderValid();
+      }
+      if (this.state.empty) {
+        return this.renderEmpty();
+      }
+      if (!this.state.valid) {
+        return this.renderInvalid();
+      }
+    }
+    handleInvalidSubmit(event) {
+      event.preventDefault();
+      const currentValue = this.accessCurrentValue();
+      this.state.valid = false;
+      this.state.empty = currentValue === '';
+      this.renderValidity();
+      this.form.focusOnFirstInvalid.apply(this.form);
+      // For UX, wait til after first invalid submission to check each keyup
+      this.inputElement.off('keyup.field_validator')
+        .on('keyup.field_validator', this.updateValidity.bind(this));
+    }
+    /* Get or set current input value */
+    accessCurrentValue(newVal) {
+      return newVal ? this.inputElement.val(newVal) : this.inputElement.val();
+    }
+    getInputValidity() {
+      return this.inputDomElement.validity.valid;
+    }
+    updateValidity() {
+      const inputVal = this.accessCurrentValue();
+      this.state.empty = !inputVal.length;
+      this.state.valid = this.getInputValidity();
+      this.renderValidity();
+    }
+    renderValid() {
+      return this.renderClear();
+    }
+    renderEmpty() {
+      return this.renderInvalid();
+    }
+    renderInvalid() {
+      this.inputElement.addClass(inputErrorClass);
+      this.scopedSiblings.hide();
+      return this.fieldErrorElement.show();
+    }
+    renderClear() {
+      const inputVal = this.accessCurrentValue();
+      if (!inputVal.split(' ').length) {
+        const trimmedInput = inputVal.trim();
+        this.accessCurrentValue(trimmedInput);
+      }
+      this.inputElement.removeClass(inputErrorClass);
+      this.scopedSiblings.hide();
+      this.fieldErrorElement.hide();
+    }
+  }
+  const customValidationFlag = 'no-gl-field-errors';
+  class GlFieldErrors {
+    constructor(form) {
+      this.form = $(form);
+      this.state = {
+        inputs: [],
+        valid: false
+      };
+      this.initValidators();
+    }
+    initValidators () {
+      // select all non-hidden inputs in form
+      this.state.inputs = this.form.find(':input:not([type=hidden])').toArray()
+        .filter((input) => !input.classList.contains(customValidationFlag))
+        .map((input) => new GlFieldError({ input, formErrors: this }));
+      this.form.on('submit', this.catchInvalidFormSubmit);
+    }
+    /* Neccessary to prevent intercept and override invalid form submit
+     * because Safari & iOS quietly allow form submission when form is invalid
+     * and prevents disabling of invalid submit button by application.js */
+    catchInvalidFormSubmit (event) {
+      if (!event.currentTarget.checkValidity()) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+    }
+    focusOnFirstInvalid () {
+      const firstInvalid = this.state.inputs.filter((input) => !input.inputDomElement.validity.valid)[0];
+      firstInvalid.inputElement.focus();
+    }
+  }
+  global.GlFieldErrors = GlFieldErrors;
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/groups.js
+++ b/app/assets/javascripts/groups.js
-(function() {
-  this.GroupMembers = (function() {
-    function GroupMembers() {
-      $('li.group_member').bind('ajax:success', function() {
-        return $(this).fadeOut();
-      });
-    }
-    return GroupMembers;
-  })();
-}).call(this);
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -292,7 +292,7 @@
              return;
            }
-            if (page === 'projects:boards:show') {
+            if ($('html').hasClass('issue-boards-page')) {
              return;
            }
            if ($dropdown.hasClass('js-multiselect')) {
@@ -334,7 +334,7 @@
            page = $('body').data('page');
            isIssueIndex = page === 'projects:issues:index';
            isMRIndex = page === 'projects:merge_requests:index';
-            if (page === 'projects:boards:show') {
+            if ($('html').hasClass('issue-boards-page')) {
              if (label.isAny) {
                gl.issueBoards.BoardsStore.state.filters['label_name'] = [];
              }

--- a/app/assets/javascripts/member_expiration_date.js
+++ b/app/assets/javascripts/member_expiration_date.js
@@ -14,14 +14,18 @@
    inputs.datepicker({
      dateFormat: 'yy-mm-dd',
      minDate: 1,
-      onSelect: toggleClearInput
+      onSelect: function () {
+        $(this).trigger('change');
+        toggleClearInput.call(this);
+      }
    });
    inputs.next('.js-clear-input').on('click', function(event) {
      event.preventDefault();
      var input = $(this).closest('.clearable-input').find('.js-access-expiration-date');
-      input.datepicker('setDate', null);
+      input.datepicker('setDate', null)
+        .trigger('change');
      toggleClearInput.call(input);
    });

--- a/app/assets/javascripts/members.js.es6
+++ b/app/assets/javascripts/members.js.es6
+((w) => {
+  w.gl = w.gl || {};
+  class Members {
+    constructor() {
+      this.addListeners();
+    }
+    addListeners() {
+      $('.project_member, .group_member').off('ajax:success').on('ajax:success', this.removeRow);
+      $('.js-member-update-control').off('change').on('change', this.formSubmit);
+      $('.js-edit-member-form').off('ajax:success').on('ajax:success', this.formSuccess);
+    }
+    removeRow(e) {
+      const $target = $(e.target);
+      if ($target.hasClass('btn-remove')) {
+        $target.closest('.member')
+          .fadeOut(function () {
+            $(this).remove();
+          });
+      }
+    }
+    formSubmit() {
+      $(this).closest('form').trigger("submit.rails").end().disable();
+    }
+    formSuccess() {
+      $(this).find('.js-member-update-control').enable();
+    }
+  }
+  gl.Members = Members;
+})(window);
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
-const HEAD_HEADER_TEXT    = 'HEAD//our changes';
-const ORIGIN_HEADER_TEXT  = 'origin//their changes';
-const HEAD_BUTTON_TITLE   = 'Use ours';
-const ORIGIN_BUTTON_TITLE = 'Use theirs';
-class MergeConflictDataProvider {
-  getInitialData() {
-    // TODO: remove reliance on jQuery and DOM state introspection
-    const diffViewType = $.cookie('diff_view');
-    const fixedLayout = $('.content-wrapper .container-fluid').hasClass('container-limited');
-    return {
-      isLoading      : true,
-      hasError       : false,
-      isParallel     : diffViewType === 'parallel',
-      diffViewType   : diffViewType,
-      fixedLayout    : fixedLayout,
-      isSubmitting   : false,
-      conflictsData  : {},
-      resolutionData : {}
-    }
-  }
-  decorateData(vueInstance, data) {
-    this.vueInstance = vueInstance;
-    if (data.type === 'error') {
-      vueInstance.hasError = true;
-      data.errorMessage = data.message;
-    }
-    else {
-      data.shortCommitSha = data.commit_sha.slice(0, 7);
-      data.commitMessage  = data.commit_message;
-      this.setParallelLines(data);
-      this.setInlineLines(data);
-      this.updateResolutionsData(data);
-    }
-    vueInstance.conflictsData = data;
-    vueInstance.isSubmitting = false;
-    const conflictsText = this.getConflictsCount() > 1 ? 'conflicts' : 'conflict';
-    vueInstance.conflictsData.conflictsText = conflictsText;
-  }
-  updateResolutionsData(data) {
-    const vi = this.vueInstance;
-    data.files.forEach( (file) => {
-      file.sections.forEach( (section) => {
-        if (section.conflict) {
-          vi.$set(`resolutionData['${section.id}']`, false);
-        }
-      });
-    });
-  }
-  setParallelLines(data) {
-    data.files.forEach( (file) => {
-      file.filePath  = this.getFilePath(file);
-      file.iconClass = `fa-${file.blob_icon}`;
-      file.blobPath  = file.blob_path;
-      file.parallelLines = [];
-      const linesObj = { left: [], right: [] };
-      file.sections.forEach( (section) => {
-        const { conflict, lines, id } = section;
-        if (conflict) {
-          linesObj.left.push(this.getOriginHeaderLine(id));
-          linesObj.right.push(this.getHeadHeaderLine(id));
-        }
-        lines.forEach( (line) => {
-          const { type } = line;
-          if (conflict) {
-            if (type === 'old') {
-              linesObj.left.push(this.getLineForParallelView(line, id, 'conflict'));
-            }
-            else if (type === 'new') {
-              linesObj.right.push(this.getLineForParallelView(line, id, 'conflict', true));
-            }
-          }
-          else {
-            const lineType = type || 'context';
-            linesObj.left.push (this.getLineForParallelView(line, id, lineType));
-            linesObj.right.push(this.getLineForParallelView(line, id, lineType, true));
-          }
-        });
-        this.checkLineLengths(linesObj);
-      });
-      for (let i = 0, len = linesObj.left.length; i < len; i++) {
-        file.parallelLines.push([
-          linesObj.right[i],
-          linesObj.left[i]
-        ]);
-      }
-    });
-  }
-  checkLineLengths(linesObj) {
-    let { left, right } = linesObj;
-    if (left.length !== right.length) {
-      if (left.length > right.length) {
-        const diff = left.length - right.length;
-        for (let i = 0; i < diff; i++) {
-          right.push({ lineType: 'emptyLine', richText: '' });
-        }
-      }
-      else {
-        const diff = right.length - left.length;
-        for (let i = 0; i < diff; i++) {
-          left.push({ lineType: 'emptyLine', richText: '' });
-        }
-      }
-    }
-  }
-  setInlineLines(data) {
-    data.files.forEach( (file) => {
-      file.iconClass   = `fa-${file.blob_icon}`;
-      file.blobPath    = file.blob_path;
-      file.filePath    = this.getFilePath(file);
-      file.inlineLines = []
-      file.sections.forEach( (section) => {
-        let currentLineType = 'new';
-        const { conflict, lines, id } = section;
-        if (conflict) {
-          file.inlineLines.push(this.getHeadHeaderLine(id));
-        }
-        lines.forEach( (line) => {
-          const { type } = line;
-          if ((type === 'new' || type === 'old') && currentLineType !== type) {
-            currentLineType = type;
-            file.inlineLines.push({ lineType: 'emptyLine', richText: '' });
-          }
-          this.decorateLineForInlineView(line, id, conflict);
-          file.inlineLines.push(line);
-        })
-        if (conflict) {
-          file.inlineLines.push(this.getOriginHeaderLine(id));
-        }
-      });
-    });
-  }
-  handleSelected(sectionId, selection) {
-    const vi = this.vueInstance;
-    vi.resolutionData[sectionId] = selection;
-    vi.conflictsData.files.forEach( (file) => {
-      file.inlineLines.forEach( (line) => {
-        if (line.id === sectionId && (line.hasConflict || line.isHeader)) {
-          this.markLine(line, selection);
-        }
-      });
-      file.parallelLines.forEach( (lines) => {
-        const left         = lines[0];
-        const right        = lines[1];
-        const hasSameId    = right.id === sectionId || left.id === sectionId;
-        const isLeftMatch  = left.hasConflict || left.isHeader;
-        const isRightMatch = right.hasConflict || right.isHeader;
-        if (hasSameId && (isLeftMatch || isRightMatch)) {
-          this.markLine(left, selection);
-          this.markLine(right, selection);
-        }
-      })
-    });
-  }
-  updateViewType(newType) {
-    const vi = this.vueInstance;
-    if (newType === vi.diffViewType || !(newType === 'parallel' || newType === 'inline')) {
-      return;
-    }
-    vi.diffViewType = newType;
-    vi.isParallel   = newType === 'parallel';
-    $.cookie('diff_view', newType, {
-      path: (gon && gon.relative_url_root) || '/'
-    });
-    $('.content-wrapper .container-fluid')
-      .toggleClass('container-limited', !vi.isParallel && vi.fixedLayout);
-  }
-  markLine(line, selection) {
-    if (selection === 'head' && line.isHead) {
-      line.isSelected   = true;
-      line.isUnselected = false;
-    }
-    else if (selection === 'origin' && line.isOrigin) {
-      line.isSelected   = true;
-      line.isUnselected = false;
-    }
-    else {
-      line.isSelected   = false;
-      line.isUnselected = true;
-    }
-  }
-  getConflictsCount() {
-    return Object.keys(this.vueInstance.resolutionData).length;
-  }
-  getResolvedCount() {
-    let  count = 0;
-    const data = this.vueInstance.resolutionData;
-    for (const id in data) {
-      const resolution = data[id];
-      if (resolution) {
-        count++;
-      }
-    }
-    return count;
-  }
-  isReadyToCommit() {
-    const { conflictsData, isSubmitting } = this.vueInstance
-    const allResolved = this.getConflictsCount() === this.getResolvedCount();
-    const hasCommitMessage = $.trim(conflictsData.commitMessage).length;
-    return !isSubmitting && hasCommitMessage && allResolved;
-  }
-  getCommitButtonText() {
-    const initial = 'Commit conflict resolution';
-    const inProgress = 'Committing...';
-    const vue = this.vueInstance;
-    return vue ? vue.isSubmitting ? inProgress : initial : initial;
-  }
-  decorateLineForInlineView(line, id, conflict) {
-    const { type }    = line;
-    line.id           = id;
-    line.hasConflict  = conflict;
-    line.isHead       = type === 'new';
-    line.isOrigin     = type === 'old';
-    line.hasMatch     = type === 'match';
-    line.richText     = line.rich_text;
-    line.isSelected   = false;
-    line.isUnselected = false;
-  }
-  getLineForParallelView(line, id, lineType, isHead) {
-    const { old_line, new_line, rich_text } = line;
-    const hasConflict = lineType === 'conflict';
-    return {
-      id,
-      lineType,
-      hasConflict,
-      isHead       : hasConflict && isHead,
-      isOrigin     : hasConflict && !isHead,
-      hasMatch     : lineType === 'match',
-      lineNumber   : isHead ? new_line : old_line,
-      section      : isHead ? 'head' : 'origin',
-      richText     : rich_text,
-      isSelected   : false,
-      isUnselected : false
-    }
-  }
-  getHeadHeaderLine(id) {
-    return {
-      id          : id,
-      richText    : HEAD_HEADER_TEXT,
-      buttonTitle : HEAD_BUTTON_TITLE,
-      type        : 'new',
-      section     : 'head',
-      isHeader    : true,
-      isHead      : true,
-      isSelected  : false,
-      isUnselected: false
-    }
-  }
-  getOriginHeaderLine(id) {
-    return {
-      id          : id,
-      richText    : ORIGIN_HEADER_TEXT,
-      buttonTitle : ORIGIN_BUTTON_TITLE,
-      type        : 'old',
-      section     : 'origin',
-      isHeader    : true,
-      isOrigin    : true,
-      isSelected  : false,
-      isUnselected: false
-    }
-  }
-  handleFailedRequest(vueInstance, data) {
-    vueInstance.hasError = true;
-    vueInstance.conflictsData.errorMessage = 'Something went wrong!';
-  }
-  getCommitData() {
-    return {
-      commit_message: this.vueInstance.conflictsData.commitMessage,
-      sections: this.vueInstance.resolutionData
-    }
-  }
-  getFilePath(file) {
-    const { old_path, new_path } = file;
-    return old_path === new_path ? new_path : `${old_path} → ${new_path}`;
-  }
-}
--- a/app/assets/javascripts/merge_conflict_resolver.js.es6
+++ b/app/assets/javascripts/merge_conflict_resolver.js.es6
-//= require vue
-class MergeConflictResolver {
-  constructor() {
-    this.dataProvider = new MergeConflictDataProvider()
-    this.initVue()
-  }
-  initVue() {
-    const that = this;
-    this.vue   = new Vue({
-      el       : '#conflicts',
-      name     : 'MergeConflictResolver',
-      data     : this.dataProvider.getInitialData(),
-      created  : this.fetchData(),
-      computed : this.setComputedProperties(),
-      methods  : {
-        handleSelected(sectionId, selection) {
-          that.dataProvider.handleSelected(sectionId, selection);
-        },
-        handleViewTypeChange(newType) {
-          that.dataProvider.updateViewType(newType);
-        },
-        commit() {
-          that.commit();
-        }
-      }
-    })
-  }
-  setComputedProperties() {
-    const dp = this.dataProvider;
-    return {
-      conflictsCount() { return dp.getConflictsCount() },
-      resolvedCount() { return dp.getResolvedCount() },
-      readyToCommit() { return dp.isReadyToCommit() },
-      commitButtonText() { return dp.getCommitButtonText() }
-    }
-  }
-  fetchData() {
-    const dp = this.dataProvider;
-    $.get($('#conflicts').data('conflictsPath'))
-      .done((data) => {
-        dp.decorateData(this.vue, data);
-      })
-      .error((data) => {
-        dp.handleFailedRequest(this.vue, data);
-      })
-      .always(() => {
-        this.vue.isLoading = false;
-        this.vue.$nextTick(() => {
-          $('#conflicts .js-syntax-highlight').syntaxHighlight();
-        });
-        $('.content-wrapper .container-fluid')
-          .toggleClass('container-limited', !this.vue.isParallel && this.vue.fixedLayout);
-      })
-  }
-  commit() {
-    this.vue.isSubmitting = true;
-    $.post($('#conflicts').data('resolveConflictsPath'), this.dataProvider.getCommitData())
-      .done((data) => {
-        window.location.href = data.redirect_to;
-      })
-      .error(() => {
-        this.vue.isSubmitting = false;
-        new Flash('Something went wrong!');
-      });
-  }
-}
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.diffFileEditor = Vue.extend({
+    props: {
+      file: Object,
+      onCancelDiscardConfirmation: Function,
+      onAcceptDiscardConfirmation: Function
+    },
+    data() {
+      return {
+        saved: false,
+        loading: false,
+        fileLoaded: false,
+        originalContent: '',
+      }
+    },
+    computed: {
+      classObject() {
+        return {
+          'saved': this.saved,
+          'is-loading': this.loading
+        };
+      }
+    },
+    watch: {
+      ['file.showEditor'](val) {
+        this.resetEditorContent();
+        if (!val || this.fileLoaded || this.loading) {
+          return;
+        }
+        this.loadEditor();
+      }
+    },
+    ready() {
+      if (this.file.loadEditor) {
+        this.loadEditor();
+      }
+    },
+    methods: {
+      loadEditor() {
+        this.loading = true;
+        $.get(this.file.content_path)
+          .done((file) => {
+            let content = this.$el.querySelector('pre');
+            let fileContent = document.createTextNode(file.content);
+            content.textContent = fileContent.textContent;
+            this.originalContent = file.content;
+            this.fileLoaded = true;
+            this.editor = ace.edit(content);
+            this.editor.$blockScrolling = Infinity; // Turn off annoying warning
+            this.editor.getSession().setMode(`ace/mode/${file.blob_ace_mode}`);
+            this.editor.on('change', () => {
+              this.saveDiffResolution();
+            });
+            this.saveDiffResolution();
+          })
+          .fail(() => {
+            new Flash('Failed to load the file, please try again.');
+          })
+          .always(() => {
+            this.loading = false;
+          });
+      },
+      saveDiffResolution() {
+        this.saved = true;
+        // This probably be better placed in the data provider
+        this.file.content = this.editor.getValue();
+        this.file.resolveEditChanged = this.file.content !== this.originalContent;
+        this.file.promptDiscardConfirmation = false;
+      },
+      resetEditorContent() {
+        if (this.fileLoaded) {
+          this.editor.setValue(this.originalContent, -1);
+        }
+      },
+      cancelDiscardConfirmation(file) {
+        this.onCancelDiscardConfirmation(file);
+      },
+      acceptDiscardConfirmation(file) {
+        this.onAcceptDiscardConfirmation(file);
+      }
+    }
+  });
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.inlineConflictLines = Vue.extend({
+    props: {
+      file: Object
+    },
+    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
+  });
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.parallelConflictLine = Vue.extend({
+    props: {
+      file: Object,
+      line: Object
+    },
+    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
+    template: '#parallel-conflict-line'
+  });
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.parallelConflictLines = Vue.extend({
+    props: {
+      file: Object
+    },
+    mixins: [global.mergeConflicts.utils],
+    components: {
+      'parallel-conflict-line': gl.mergeConflicts.parallelConflictLine
+    }
+  });
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  class mergeConflictsService {
+    constructor(options) {
+      this.conflictsPath = options.conflictsPath;
+      this.resolveConflictsPath = options.resolveConflictsPath;
+    }
+    fetchConflictsData() {
+      return $.ajax({
+        dataType: 'json',
+        url: this.conflictsPath
+      });
+    }
+    submitResolveConflicts(data) {
+      return $.ajax({
+        url: this.resolveConflictsPath,
+        data: JSON.stringify(data),
+        contentType: 'application/json',
+        dataType: 'json',
+        method: 'POST'
+      });
+    }
+  };
+  global.mergeConflicts.mergeConflictsService = mergeConflictsService;
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+//= require vue
+//= require ./merge_conflict_store
+//= require ./merge_conflict_service
+//= require ./mixins/line_conflict_utils
+//= require ./mixins/line_conflict_actions
+//= require ./components/diff_file_editor
+//= require ./components/inline_conflict_lines
+//= require ./components/parallel_conflict_line
+//= require ./components/parallel_conflict_lines
+$(() => {
+  const INTERACTIVE_RESOLVE_MODE = 'interactive';
+  const conflictsEl = document.querySelector('#conflicts');
+  const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
+  const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({
+    conflictsPath: conflictsEl.dataset.conflictsPath,
+    resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath
+  });
+  gl.MergeConflictsResolverApp = new Vue({
+    el: '#conflicts',
+    data: mergeConflictsStore.state,
+    components: {
+      'diff-file-editor': gl.mergeConflicts.diffFileEditor,
+      'inline-conflict-lines': gl.mergeConflicts.inlineConflictLines,
+      'parallel-conflict-lines': gl.mergeConflicts.parallelConflictLines
+    },
+    computed: {
+      conflictsCountText() { return mergeConflictsStore.getConflictsCountText() },
+      readyToCommit() { return mergeConflictsStore.isReadyToCommit() },
+      commitButtonText() { return mergeConflictsStore.getCommitButtonText() },
+      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent() }
+    },
+    created() {
+      mergeConflictsService
+        .fetchConflictsData()
+        .done((data) => {
+          if (data.type === 'error') {
+            mergeConflictsStore.setFailedRequest(data.message);
+          } else {
+            mergeConflictsStore.setConflictsData(data);
+          }
+        })
+        .error(() => {
+          mergeConflictsStore.setFailedRequest();
+        })
+        .always(() => {
+          mergeConflictsStore.setLoadingState(false);
+          this.$nextTick(() => {
+            $(conflictsEl.querySelectorAll('.js-syntax-highlight')).syntaxHighlight();
+          });
+        });
+    },
+    methods: {
+      handleViewTypeChange(viewType) {
+        mergeConflictsStore.setViewType(viewType);
+      },
+      onClickResolveModeButton(file, mode) {
+        if (mode === INTERACTIVE_RESOLVE_MODE && file.resolveEditChanged) {
+          mergeConflictsStore.setPromptConfirmationState(file, true);
+          return;
+        }
+        mergeConflictsStore.setFileResolveMode(file, mode);
+      },
+      acceptDiscardConfirmation(file) {
+        mergeConflictsStore.setPromptConfirmationState(file, false);
+        mergeConflictsStore.setFileResolveMode(file, INTERACTIVE_RESOLVE_MODE);
+      },
+      cancelDiscardConfirmation(file) {
+        mergeConflictsStore.setPromptConfirmationState(file, false);
+      },
+      commit() {
+        mergeConflictsStore.setSubmitState(true);
+        mergeConflictsService
+          .submitResolveConflicts(mergeConflictsStore.getCommitData())
+          .done((data) => {
+            window.location.href = data.redirect_to;
+          })
+          .error(() => {
+            mergeConflictsStore.setSubmitState(false);
+            new Flash('Failed to save merge conflicts resolutions. Please try again!');
+          });
+      }
+    }
+  })
+});
--- a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js.es6
+++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.actions = {
+    methods: {
+      handleSelected(file, sectionId, selection) {
+        gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
+      }
+    }
+  };
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6
+++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+  global.mergeConflicts.utils = {
+    methods: {
+      lineCssClass(line) {
+        return {
+          'head': line.isHead,
+          'origin': line.isOrigin,
+          'match': line.hasMatch,
+          'selected': line.isSelected,
+          'unselected': line.isUnselected
+        };
+      }
+    }
+  };
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -71,6 +71,7 @@
      this._location = location;
      this.bindEvents();
      this.activateTab(this.opts.action);
+      this.initAffix();
    }
    MergeRequestTabs.prototype.bindEvents = function() {
@@ -380,6 +381,46 @@
    // Only when sidebar is collapsed
    };
+    MergeRequestTabs.prototype.initAffix = function () {
+      var $tabs = $('.js-tabs-affix');
+      // Screen space on small screens is usually very sparse
+      // So we dont affix the tabs on these
+      if (Breakpoints.get().getBreakpointSize() === 'xs' || !$tabs.length) return;
+      var tabsWidth = $tabs.outerWidth(),
+        $diffTabs = $('#diff-notes-app'),
+        offsetTop = $tabs.offset().top - ($('.navbar-fixed-top').height() + $('.layout-nav').height());
+      $tabs.off('affix.bs.affix affix-top.bs.affix')
+        .affix({
+          offset: {
+            top: offsetTop
+          }
+        }).on('affix.bs.affix', function () {
+          $tabs.css({
+            left: $tabs.offset().left,
+            width: tabsWidth
+          });
+          $diffTabs.css({
+            marginTop: $tabs.height()
+          });
+        }).on('affix-top.bs.affix', function () {
+          $tabs.css({
+            left: '',
+            width: ''
+          });
+          $diffTabs.css({
+            marginTop: ''
+          });
+        });
+      // Fix bug when reloading the page already scrolling
+      if ($tabs.hasClass('affix')) {
+        $tabs.trigger('affix.bs.affix');
+      }
+    };
    return MergeRequestTabs;
  })();

--- a/app/assets/javascripts/merge_request_widget.js
+++ b/app/assets/javascripts/merge_request_widget.js
-(function() {
+ ((global) => {
  var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-  this.MergeRequestWidget = (function() {
+  const DEPLOYMENT_TEMPLATE = `<div class="mr-widget-heading" id="<%- id %>">
+       <div class="ci_widget ci-success">
+         <%= ci_success_icon %>
+         <span>
+           Deployed to
+           <a href="<%- url %>" target="_blank" class="environment">
+             <%- name %>
+           </a>
+           <span class="js-environment-timeago" data-toggle="tooltip" data-placement="top" data-title="<%- deployed_at_formatted %>">
+             <%- deployed_at %>
+           </span>
+           <a class="js-environment-link" href="<%- external_url %>" target="_blank">
+             <i class="fa fa-external-link"></i>
+             View on <%- external_url_formatted %>
+           </a>
+         </span>
+       </div>
+     </div>`;
+   global.MergeRequestWidget = (function() {
    function MergeRequestWidget(opts) {
      // Initialize MergeRequestWidget behavior
      //
@@ -10,17 +29,23 @@
      //   ci_status_url        - String, URL to use to check CI status
      //
      this.opts = opts;
+      this.$widgetBody = $('.mr-widget-body');
      $('#modal_merge_info').modal({
        show: false
      });
      this.firstCICheck = true;
      this.readyForCICheck = false;
+      this.readyForCIEnvironmentCheck = false;
      this.cancel = false;
      clearInterval(this.fetchBuildStatusInterval);
+      clearInterval(this.fetchBuildEnvironmentStatusInterval);
      this.clearEventListeners();
      this.addEventListeners();
      this.getCIStatus(false);
+      this.getCIEnvironmentsStatus();
+      this.retrieveSuccessIcon();
      this.pollCIStatus();
+      this.pollCIEnvironmentsStatus();
      notifyPermissions();
    }
@@ -41,6 +66,7 @@
          page = $('body').data('page').split(':').last();
          if (allowedPages.indexOf(page) < 0) {
            clearInterval(_this.fetchBuildStatusInterval);
+            clearInterval(_this.fetchBuildEnvironmentStatusInterval);
            _this.cancelPolling();
            return _this.clearEventListeners();
          }
@@ -48,6 +74,12 @@
      })(this));
    };
+    MergeRequestWidget.prototype.retrieveSuccessIcon = function() {
+       const $ciSuccessIcon = $('.js-success-icon');
+       this.$ciSuccessIcon = $ciSuccessIcon.html();
+       $ciSuccessIcon.remove();
+     }
    MergeRequestWidget.prototype.mergeInProgress = function(deleteSourceBranch) {
      if (deleteSourceBranch == null) {
        deleteSourceBranch = false;
@@ -62,7 +94,7 @@
              urlSuffix = deleteSourceBranch ? '?deleted_source_branch=true' : '';
              return window.location.href = window.location.pathname + urlSuffix;
            } else if (data.merge_error) {
-              return $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>");
+              return this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
            } else {
              callback = function() {
                return merge_request_widget.mergeInProgress(deleteSourceBranch);
@@ -118,6 +150,7 @@
          if (data.status === '') {
            return;
          }
+          if (data.environments && data.environments.length) _this.renderEnvironments(data.environments);
          if (_this.firstCICheck || data.status !== _this.opts.ci_status && (data.status != null)) {
            _this.opts.ci_status = data.status;
            _this.showCIStatus(data.status);
@@ -150,6 +183,41 @@
      })(this));
    };
+    MergeRequestWidget.prototype.pollCIEnvironmentsStatus = function() {
+      this.fetchBuildEnvironmentStatusInterval = setInterval(() => {
+        if (!this.readyForCIEnvironmentCheck) return;
+        this.getCIEnvironmentsStatus();
+        this.readyForCIEnvironmentCheck = false;
+      }, 300000);
+    };
+    MergeRequestWidget.prototype.getCIEnvironmentsStatus = function() {
+      $.getJSON(this.opts.ci_environments_status_url, (environments) => {
+        if (this.cancel) return;
+        this.readyForCIEnvironmentCheck = true;
+        if (environments && environments.length) this.renderEnvironments(environments);
+      });
+    };
+    MergeRequestWidget.prototype.renderEnvironments = function(environments) {
+      for (let i = 0; i < environments.length; i++) {
+        const environment = environments[i];
+        if ($(`.mr-state-widget #${ environment.id }`).length) return;
+        const $template = $(DEPLOYMENT_TEMPLATE);
+        if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
+        if (environment.deployed_at && environment.deployed_at_formatted) {
+          environment.deployed_at = $.timeago(environment.deployed_at) + '.';
+        } else {
+          $('.js-environment-timeago', $template).remove();
+          environment.name += '.';
+        }
+        environment.ci_success_icon = this.$ciSuccessIcon;
+        const templateString = _.unescape($template[0].outerHTML);
+        const template = _.template(templateString)(environment)
+        this.$widgetBody.before(template);
+      }
+     };
    MergeRequestWidget.prototype.showCIStatus = function(state) {
      var allowed_states;
      if (state == null) {
@@ -190,4 +258,4 @@
  })();
-}).call(this);
+ })(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -110,7 +110,7 @@
              e.preventDefault();
              return;
            }
-            if (page === 'projects:boards:show') {
+            if ($('html').hasClass('issue-boards-page')) {
              gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = selected.name;
              gl.issueBoards.BoardsStore.updateFiltersUrl();
              e.preventDefault();

--- a/app/assets/javascripts/pipeline.js.es6
+++ b/app/assets/javascripts/pipeline.js.es6
-(function() {
-  function toggleGraph() {
-    const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
-    const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
-    const $btnText = $(this).find('.toggle-btn-text');
-    const $icon = $(this).find('.fa');
-    $($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
-    const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
-    const expandIcon = 'fa-caret-down';
-    const hideIcon = 'fa-caret-up';
-    if(graphCollapsed) {
-      $btnText.text('Expand');
-      $icon.removeClass(hideIcon).addClass(expandIcon);
-    } else {
-      $btnText.text('Hide');
-      $icon.removeClass(expandIcon).addClass(hideIcon);
-    }
-  }
-  $(document).on('click', '.toggle-pipeline-btn', toggleGraph);
-})();
--- a/app/assets/javascripts/pipelines.js.es6
+++ b/app/assets/javascripts/pipelines.js.es6
+((global) => {
+  class Pipelines {
+    constructor() {
+      $(document).off('click', '.toggle-pipeline-btn').on('click', '.toggle-pipeline-btn', this.toggleGraph);
+      this.addMarginToBuildColumns();
+    }
+    toggleGraph() {
+      const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
+      const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
+      const $btnText = $(this).find('.toggle-btn-text');
+      const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
+      $($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
+      graphCollapsed ? $btnText.text('Hide') : $btnText.text('Expand')
+    }
+    addMarginToBuildColumns() {
+      const $secondChildBuildNode = $('.build:nth-child(2)');
+      if ($secondChildBuildNode.length) {
+        const $firstChildBuildNode = $secondChildBuildNode.prev('.build');
+        const $multiBuildColumn = $secondChildBuildNode.closest('.stage-column');
+        const $previousColumn = $multiBuildColumn.prev('.stage-column');
+        $multiBuildColumn.addClass('left-margin');
+        $firstChildBuildNode.addClass('left-connector');
+        $previousColumn.each(function() {
+          $this = $(this);
+          if ($('.build', $this).length === 1) $this.addClass('no-margin');
+        });
+      }
+      $('.pipeline-graph').removeClass('hidden');
+    }
+  }
+  global.Pipelines = Pipelines;
+})(window.gl || (window.gl = {}));
--- a/app/assets/javascripts/project_find_file.js
+++ b/app/assets/javascripts/project_find_file.js
@@ -7,6 +7,7 @@
    function ProjectFindFile(element1, options) {
      this.element = element1;
      this.options = options;
+      this.goToBlob = bind(this.goToBlob, this);
      this.goToTree = bind(this.goToTree, this);
      this.selectRowDown = bind(this.selectRowDown, this);
      this.selectRowUp = bind(this.selectRowUp, this);
@@ -154,6 +155,14 @@
      return location.href = this.options.treeUrl;
    };
+    ProjectFindFile.prototype.goToBlob = function() {
+      var $link = this.element.find(".tree-item.selected .tree-item-file-name a");
+      if ($link.length) {
+        $link.get(0).click();
+      }
+    };
    return ProjectFindFile;
  })();

--- a/app/assets/javascripts/project_members.js
+++ b/app/assets/javascripts/project_members.js
-(function() {
-  this.ProjectMembers = (function() {
-    function ProjectMembers() {
-      $('li.project_member').bind('ajax:success', function() {
-        return $(this).fadeOut();
-      });
-    }
-    return ProjectMembers;
-  })();
-}).call(this);
--- a/app/assets/javascripts/project_new.js
+++ b/app/assets/javascripts/project_new.js
@@ -4,7 +4,9 @@
  this.ProjectNew = (function() {
    function ProjectNew() {
      this.toggleSettings = bind(this.toggleSettings, this);
-      this.$selects = $('.features select');
+      this.$selects = $('.features select').filter(function () {
+        return $(this).data('field');
+      });
      $('.project-edit-container').on('ajax:before', (function(_this) {
        return function() {

--- a/app/assets/javascripts/templates/issuable_template_selector.js.es6
+++ b/app/assets/javascripts/templates/issuable_template_selector.js.es6
@@ -16,7 +16,13 @@
      if (initialQuery.name) this.requestFile(initialQuery);
      $('.reset-template', this.dropdown.parent()).on('click', () => {
-        if (this.currentTemplate) this.setInputValueToTemplateContent(false);
+        this.setInputValueToTemplateContent();
+      });
+      $('.no-template', this.dropdown.parent()).on('click', () => {
+        this.currentTemplate = '';
+        this.setInputValueToTemplateContent();
+        $('.dropdown-toggle-text', this.dropdown).text('Choose a template');
      });
    }

--- a/app/assets/javascripts/username_validator.js.es6
+++ b/app/assets/javascripts/username_validator.js.es6
+((global) => {
+  const debounceTimeoutDuration = 1000;
+  const invalidInputClass = 'gl-field-error-outline';
+  const successInputClass = 'gl-field-success-outline';
+  const unavailableMessageSelector = '.username .validation-error';
+  const successMessageSelector = '.username .validation-success';
+  const pendingMessageSelector = '.username .validation-pending';
+  const invalidMessageSelector = '.username .gl-field-error';
+  class UsernameValidator {
+    constructor() {
+      this.inputElement = $('#new_user_username');
+      this.inputDomElement = this.inputElement.get(0);
+      this.state = {
+        available: false,
+        valid: false,
+        pending: false,
+        empty: true
+      };
+      const debounceTimeout = _.debounce((username) => {
+        this.validateUsername(username);
+      }, debounceTimeoutDuration);
+      this.inputElement.on('keyup.username_check', () => {
+        const username = this.inputElement.val();
+        this.state.valid = this.inputDomElement.validity.valid;
+        this.state.empty = !username.length;
+        if (this.state.valid) {
+          return debounceTimeout(username);
+        }
+        this.renderState();
+      });
+      // Override generic field validation
+      this.inputElement.on('invalid', this.interceptInvalid.bind(this));
+    }
+    renderState() {
+      // Clear all state
+      this.clearFieldValidationState();
+      if (this.state.valid && this.state.available) {
+        return this.setSuccessState();
+      }
+      if (this.state.empty) {
+        return this.clearFieldValidationState();
+      }
+      if (this.state.pending) {
+        return this.setPendingState();
+      }
+      if (!this.state.available) {
+        return this.setUnavailableState();
+      }
+      if (!this.state.valid) {
+        return this.setInvalidState();
+      }
+    }
+    interceptInvalid(event) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    validateUsername(username) {
+      if (this.state.valid) {
+        this.state.pending = true;
+        this.state.available = false;
+        this.renderState();
+        return $.ajax({
+          type: 'GET',
+          url: `/users/${username}/exists`,
+          dataType: 'json',
+          success: (res) => this.setAvailabilityState(res.exists)
+        });
+      }
+    }
+    setAvailabilityState(usernameTaken) {
+      if (usernameTaken) {
+        this.state.valid = false;
+        this.state.available = false;
+      } else {
+        this.state.available = true;
+      }
+      this.state.pending = false;
+      this.renderState();
+    }
+    clearFieldValidationState() {
+      this.inputElement.siblings('p').hide();
+      this.inputElement.removeClass(invalidInputClass)
+        .removeClass(successInputClass);
+    }
+    setUnavailableState() {
+      const $usernameUnavailableMessage = this.inputElement.siblings(unavailableMessageSelector);
+      this.inputElement.addClass(invalidInputClass).removeClass(successInputClass);
+      $usernameUnavailableMessage.show();
+    }
+    setSuccessState() {
+      const $usernameSuccessMessage = this.inputElement.siblings(successMessageSelector);
+      this.inputElement.addClass(successInputClass).removeClass(invalidInputClass);
+      $usernameSuccessMessage.show();
+    }
+    setPendingState() {
+      const $usernamePendingMessage = $(pendingMessageSelector);
+      if (this.state.pending) {
+        $usernamePendingMessage.show();
+      } else {
+        $usernamePendingMessage.hide();
+      }
+    }
+    setInvalidState() {
+      const $inputErrorMessage = $(invalidMessageSelector);
+      this.inputElement.addClass(invalidInputClass).removeClass(successInputClass);
+      $inputErrorMessage.show();
+    }
+  }
+  global.UsernameValidator = UsernameValidator;
+})(window);
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -160,7 +160,7 @@
                selectedId = user.id;
                return;
              }
-              if (page === 'projects:boards:show') {
+              if ($('html').hasClass('issue-boards-page')) {
                selectedId = user.id;
                gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = user.id;
                gl.issueBoards.BoardsStore.updateFiltersUrl();
@@ -261,10 +261,11 @@
                  }
                }
                if (showEmailUser && data.results.length === 0 && query.term.match(/^[^@]+@[^@]+$/)) {
+                  var trimmed = query.term.trim();
                  emailUser = {
                    name: "Invite \"" + query.term + "\"",
-                    username: query.term,
+                    username: trimmed,
-                    id: query.term
+                    id: trimmed
                  };
                  data.results.unshift(emailUser);
                }
@@ -324,6 +325,10 @@
    };
    UsersSelect.prototype.user = function(user_id, callback) {
+      if(!/^\d+$/.test(user_id)) {
+        return false;
+      }
      var url;
      url = this.buildUrl(this.userPath);
      url = url.replace(':id', user_id);

--- a/app/assets/stylesheets/behaviors.scss
+++ b/app/assets/stylesheets/behaviors.scss
@@ -5,6 +5,7 @@
    display: none;
    &.hide { display: block; }
  }
  &.open .content {
    display: block;
    &.hide { display: none; }

--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -19,6 +19,7 @@
  &.diff-collapsed {
    padding: 5px;
    .click-to-expand {
      cursor: pointer;
    }
@@ -203,6 +204,7 @@
      }
    }
  }
  &.user-cover-block {
    padding: 24px 0 0;
  }

--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -25,7 +25,7 @@
  &:focus {
    background-color: $hover-background;
    color: $hover-text;
-    border-color: $hover-border;;
+    border-color: $hover-border;
  }
 }
@@ -152,7 +152,8 @@
    @include btn-blue-medium;
  }
-  &.btn-info {
+  &.btn-info,
+  &.btn-register {
    @include btn-blue;
  }
@@ -240,6 +241,7 @@
  width: 100%;
  margin: 0;
  margin-bottom: 15px;
  &.btn {
    padding: 6px 0;
  }
@@ -321,6 +323,7 @@
 .btn-build {
  margin-left: 10px;
  i {
    color: $gl-icon-color;
  }
@@ -328,6 +331,7 @@
 .clone-dropdown-btn a {
  color: $dropdown-link-color;
  &:hover {
    text-decoration: none;
  }
@@ -337,6 +341,7 @@
  background-color: $background-color !important;
  border: 1px solid lightgrey;
  cursor: default;
  &:active {
    -moz-box-shadow: inset 0 0 0 white;
    -webkit-box-shadow: inset 0 0 0 white;

--- a/app/assets/stylesheets/framework/callout.scss
+++ b/app/assets/stylesheets/framework/callout.scss
@@ -13,10 +13,12 @@
  color: $text-color;
  background: $background-color;
 }
 .bs-callout h4 {
  margin-top: 0;
  margin-bottom: 5px;
 }
 .bs-callout p:last-child {
  margin-bottom: 0;
 }
@@ -27,16 +29,19 @@
  border-color: #eed3d7;
  color: #b94a48;
 }
 .bs-callout-warning {
  background-color: #faf8f0;
  border-color: #faebcc;
  color: #8a6d3b;
 }
 .bs-callout-info {
  background-color: #f4f8fa;
  border-color: #bce8f1;
  color: #34789a;
 }
 .bs-callout-success {
  background-color: #dff0d8;
  border-color: #5ca64d;

--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
 /** COLORS **/
 .cgray { color: $gl-gray; }
-.clgray { color: #bbb }
+.clgray { color: #bbb; }
 .cred { color: $gl-text-red; }
 .cgreen { color: $gl-text-green; }
-.cdark { color: #444 }
+.cdark { color: #444; }
 /** COMMON CLASSES **/
 .prepend-top-0 { margin-top: 0; }
 .prepend-top-5 { margin-top: 5px; }
-.prepend-top-10 { margin-top: 10px }
+.prepend-top-10 { margin-top: 10px; }
 .prepend-top-default { margin-top: $gl-padding !important; }
-.prepend-top-20 { margin-top: 20px }
+.prepend-top-20 { margin-top: 20px; }
-.prepend-left-5 { margin-left: 5px }
+.prepend-left-5 { margin-left: 5px; }
-.prepend-left-10 { margin-left: 10px }
+.prepend-left-10 { margin-left: 10px; }
 .prepend-left-default { margin-left: $gl-padding; }
-.prepend-left-20 { margin-left: 20px }
+.prepend-left-20 { margin-left: 20px; }
-.append-right-5 { margin-right: 5px }
+.append-right-5 { margin-right: 5px; }
-.append-right-10 { margin-right: 10px }
+.append-right-10 { margin-right: 10px; }
 .append-right-default { margin-right: $gl-padding; }
-.append-right-20 { margin-right: 20px }
+.append-right-20 { margin-right: 20px; }
-.append-bottom-0 { margin-bottom: 0 }
+.append-bottom-0 { margin-bottom: 0; }
-.append-bottom-10 { margin-bottom: 10px }
+.append-bottom-10 { margin-bottom: 10px; }
-.append-bottom-15 { margin-bottom: 15px }
+.append-bottom-15 { margin-bottom: 15px; }
-.append-bottom-20 { margin-bottom: 20px }
+.append-bottom-20 { margin-bottom: 20px; }
 .append-bottom-default { margin-bottom: $gl-padding; }
-.inline { display: inline-block }
+.inline { display: inline-block; }
-.center { text-align: center }
+.center { text-align: center; }
 .underlined-link { text-decoration: underline; }
 .hint { font-style: italic; color: #999; }
@@ -97,6 +97,7 @@ span.update-author {
  color: #999;
  font-weight: normal;
  font-style: italic;
  strong {
    font-weight: bold;
    font-style: normal;
@@ -128,7 +129,7 @@ p.time {
 // Fix issue with notes & lists creating a bunch of bottom borders.
 li.note {
-  img { max-width: 100% }
+  img { max-width: 100%; }
  .note-title {
    li {
      border-bottom: none !important;
@@ -172,6 +173,7 @@ li.note {
  @extend .col-md-6;
  text-align: left;
  margin-top: 40px;
  pre {
    background: white;
    border: none;
@@ -197,6 +199,7 @@ li.note {
  background: #c67;
  color: #fff;
  font-weight: bold;
  a {
    color: #fff;
    text-decoration: underline;
@@ -227,6 +230,7 @@ li.note {
  &.milestone-closed {
    background: $gray-light;
  }
  .progress {
    margin-bottom: 0;
    margin-top: 4px;
@@ -286,6 +290,7 @@ table {
 .footer-links {
  margin-bottom: 20px;
  a {
    margin-right: 15px;
  }

--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -12,6 +12,7 @@
  .dropdown-menu,
  .dropdown-menu-nav {
    display: block;
    @media (max-width: $screen-xs-max) {
      width: 100%;
    }
@@ -48,6 +49,7 @@
    margin-top: -6px;
    color: $dropdown-toggle-icon-color;
    font-size: 10px;
    &.fa-spinner {
      font-size: 16px;
      margin-top: -8px;

--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -26,15 +26,6 @@
    padding: 10px $gl-padding;
    word-wrap: break-word;
    border-radius: 3px 3px 0 0;
-    cursor: pointer;
-    &:hover {
-      background-color: $dark-background-color;
-    }
-    .diff-toggle-caret {
-      padding-right: 6px; 
-    }
    &.file-title-clear {
      padding-left: 0;
@@ -66,6 +57,7 @@
      margin-top: -3px;
    }
  }
  .file-content {
    background: #fff;
@@ -105,22 +97,27 @@
        border: none;
        margin: 0;
      }
      tr {
        border-bottom: 1px solid #eee;
      }
      td {
        &:first-child {
          border-left: none;
        }
        &:last-child {
          border-right: none;
        }
      }
      td.blame-commit {
        padding: 0 10px;
        min-width: 400px;
        background: $gray-light;
      }
      td.line-numbers {
        float: none;
        border-left: 1px solid #ddd;
@@ -130,6 +127,7 @@
          margin-right: 0;
        }
      }
      td.lines {
        padding: 0;
      }
@@ -146,8 +144,10 @@
        border-left: 1px solid $border-color;
        margin-bottom: 0;
        background: white;
        li {
          color: #888;
          p {
            margin: 0;
            color: #333;

--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -9,7 +9,7 @@ input {
 input[type='text'].danger {
  background: #f2dede!important;
  border-color: #d66;
-  text-shadow: 0 1px 1px #fff
+  text-shadow: 0 1px 1px #fff;
 }
 .datetime-controls {
@@ -73,8 +73,8 @@ label {
 }
 .form-control {
-  box-shadow: none;
+  @include box-shadow(none);
-  border-radius: 3px;
+  border-radius: 2px;
  padding: $gl-vert-padding $gl-input-padding;
 }
@@ -117,9 +117,11 @@ label {
    display: table-cell;
    width: 200px !important;
  }
  .input-group-addon {
    background-color: #f7f8fa;
  }
  .input-group-addon:not(:first-child):not(:last-child) {
    border-left: 0;
    border-right: 0;
@@ -129,3 +131,8 @@ label {
 .help-block {
  margin-bottom: 0;
 }
+.gl-field-error {
+  color: $red-normal;
+}
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -62,7 +62,7 @@
        }
        i {
-          color: $white-light
+          color: $white-light;
        }
        path,

--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -168,6 +168,7 @@ header {
      a {
        color: $gl-text-color;
        &:hover {
          text-decoration: underline;
        }

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -60,6 +60,7 @@
      padding-top: 1px;
      margin: 0;
      color: $gray-dark;
      img {
        position: relative;
        top: 3px;
@@ -128,6 +129,10 @@ ul.content-list {
      color: $gl-dark-link-color;
    }
+    .member-group-link {
+      color: $blue-normal;
+    }
    .description {
      p {
        @include str-truncated;
@@ -168,6 +173,14 @@ ul.content-list {
      }
    }
+    .member-controls {
+      float: none;
+      @media (min-width: $screen-sm-min) {
+        float: right;
+      }
+    }
    // When dragging a list item
    &.ui-sortable-helper {
      border-bottom: none;

--- a/app/assets/stylesheets/framework/logo.scss
+++ b/app/assets/stylesheets/framework/logo.scss
-@mixin unique-keyframes {
-  $animation-name: unique-id();
-  @include webkit-prefix(animation-name, $animation-name);
-  @-webkit-keyframes #{$animation-name} {
-    @content;
-  }
-  @keyframes #{$animation-name} {
-    @content;
-  }
-}
 @mixin tanuki-logo-colors($path-color) {
  fill: $path-color;
  transition: all 0.8s;
@@ -20,28 +8,6 @@
  }
 }
-@mixin tanuki-second-highlight-animations($tanuki-color) {
-  @include unique-keyframes {
-    10%, 80% {
-      fill: #{$tanuki-color}
-    }
-    20%, 90% {
-      fill: lighten($tanuki-color, 25%);
-    }
-  }
-}
-@mixin tanuki-forth-highlight-animations($tanuki-color) {
-  @include unique-keyframes {
-    30%, 60% {
-      fill: #{$tanuki-color};
-    }
-    40%, 70% {
-      fill: lighten($tanuki-color, 25%);
-    }
-  }
-}
 .tanuki-logo {
  .tanuki-left-ear,
@@ -67,10 +33,11 @@
    }
    .tanuki-left-cheek {
-      @include unique-keyframes {
+      @include include-keyframes(animate-tanuki-left-cheek) {
        0%, 10%, 100% {
          fill: lighten($tanuki-yellow, 25%);
        }
        90% {
          fill: $tanuki-yellow;
        }
@@ -78,18 +45,35 @@
    }
    .tanuki-left-eye {
-      @include tanuki-second-highlight-animations($tanuki-orange);
+      @include include-keyframes(animate-tanuki-left-eye) {
+        10%, 80% {
+          fill: $tanuki-orange;
+        }
+        20%, 90% {
+          fill: lighten($tanuki-orange, 25%);
+        }
+      }
    }
    .tanuki-left-ear {
-      @include tanuki-second-highlight-animations($tanuki-red);
+      @include include-keyframes(animate-tanuki-left-ear) {
+        10%, 80% {
+          fill: $tanuki-red;
+        }
+        20%, 90% {
+          fill: lighten($tanuki-red, 25%);
+        }
+      }
    }
    .tanuki-nose {
-      @include unique-keyframes {
+      @include include-keyframes(animate-tanuki-nose) {
        20%, 70% {
          fill: $tanuki-red;
        }
        30%, 80% {
          fill: lighten($tanuki-red, 25%);
        }
@@ -97,22 +81,39 @@
    }
    .tanuki-right-eye {
-      @include tanuki-forth-highlight-animations($tanuki-orange);
+      @include include-keyframes(animate-tanuki-right-eye) {
+        30%, 60% {
+          fill: $tanuki-orange;
+        }
+        40%, 70% {
+          fill: lighten($tanuki-orange, 25%);
+        }
+      }
    }
    .tanuki-right-ear {
-      @include tanuki-forth-highlight-animations($tanuki-red);
+      @include include-keyframes(animate-tanuki-right-ear) {
+        30%, 60% {
+          fill: $tanuki-red;
+        }
+        40%, 70% {
+          fill: lighten($tanuki-red, 25%);
+        }
+      }
    }
    .tanuki-right-cheek {
-      @include unique-keyframes {
+      @include include-keyframes(animate-tanuki-right-cheek) {
        40% {
          fill: $tanuki-yellow;
        }
        60% {
          fill: lighten($tanuki-yellow, 25%);
        }
      }
    }
  }
 }
\ No newline at end of file
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -34,6 +34,7 @@
    &.active {
      background: $gray-light;
      a {
        font-weight: 600;
      }
@@ -84,3 +85,10 @@
    @content;
  }
 }
+@mixin include-keyframes($animation-name) {
+  @include webkit-prefix(animation-name, $animation-name);
+  @include keyframes($animation-name) {
+    @content;
+  }
+}
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -210,6 +210,7 @@
    @media (max-width: $screen-xs-max) {
      padding-bottom: 0;
      width: 100%;
      .btn, form, .dropdown, .dropdown-menu-toggle, .form-control {
        margin: 0 0 10px;
        display: block;

--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -13,6 +13,11 @@
    .dropdown-menu-toggle {
      line-height: 20px;
    }
+    .badge {
+      margin-top: -2px;
+      margin-left: 5px;
+    }
  }
  .panel-body {

--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -93,7 +93,7 @@
    background: none;
    .select2-search-field input {
-      padding: $gl-padding / 2;
+      padding: 5px $gl-padding / 2;
      font-size: 13px;
      height: auto;
      font-family: inherit;
@@ -101,7 +101,7 @@
    }
    .select2-search-choice {
-      margin: 8px 0 0 8px;
+      margin: 5px 0 0 8px;
      box-shadow: none;
      border-color: $input-border;
      color: $gl-text-color;
@@ -137,6 +137,7 @@
  .select2-results {
    max-height: 350px;
    .select2-highlighted {
      background: $gl-primary;
    }
@@ -212,9 +213,11 @@
  .group-image {
    float: left;
  }
  .group-name {
    font-weight: bold;
  }
  .group-path {
    color: #999;
  }
@@ -239,6 +242,7 @@
    color: #aaa;
    font-weight: normal;
  }
  .namespace-path {
    margin-left: 10px;
    font-weight: bolder;

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -48,6 +48,7 @@
    &:before {
      background: none;
    }
    .timeline-entry .timeline-entry-inner {
      .timeline-icon {
        display: none;

--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -48,31 +48,40 @@
 .clearfix {
  @include clearfix();
 }
 .center-block {
  @include center-block();
 }
 .pull-right {
  float: right !important;
 }
 .pull-left {
  float: left !important;
 }
 .hide {
  display: none;
 }
 .show {
  display: block !important;
 }
 .invisible {
  visibility: hidden;
 }
 .text-hide {
  @include text-hide();
 }
 .hidden {
  display: none !important;
  visibility: hidden !important;
 }
 .affix {
  position: fixed;
 }
@@ -146,6 +155,7 @@
      padding: 6px 15px;
      font-size: 13px;
      font-weight: normal;
      a {
        color: #777;
      }

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -45,40 +45,38 @@
  }
  h1 {
-    font-size: 2em;
+    font-size: 1.75em;
    font-weight: 600;
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
    padding: 0 0 0.3em;
-    border-bottom: 1px solid $btn-default-border;
+    border-bottom: 1px solid $white-dark;
    color: $gl-gray-dark;
  }
  h2 {
-    font-size: 1.6em;
+    font-size: 1.5em;
    font-weight: 600;
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
-    padding-bottom: 0.3em;
-    border-bottom: 1px solid $btn-default-border;
    color: $gl-gray-dark;
  }
  h3 {
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
-    font-size: 1.4em;
+    font-size: 1.3em;
  }
  h4 {
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
-    font-size: 1.25em;
+    font-size: 1.2em;
  }
  h5 {
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
    font-size: 1em;
  }
  h6 {
-    margin: 1em 0 10px;
+    margin: 16px 0 10px;
    font-size: 0.95em;
  }
@@ -87,7 +85,12 @@
    font-size: inherit;
    padding: 8px 21px;
    margin: 12px 0;
-    border-left: 3px solid #e7e9ed;
+    border-left: 3px solid $white-dark;
+  }
+  blockquote:dir(rtl) {
+    border-left: 0;
+    border-right: 3px solid $white-dark;
  }
  blockquote p {
@@ -106,11 +109,16 @@
    @extend .table-bordered;
    margin: 12px 0;
    color: #5c5d5e;
    th {
      background: #f8fafc;
    }
  }
+  table:dir(rtl) th {
+    text-align: right;
+  }
  pre {
    margin: 12px 0;
    font-size: 13px;
@@ -128,6 +136,10 @@
    margin: 3px 0 3px 28px !important;
  }
+  ul:dir(rtl), ol:dir(rtl) {
+    margin: 3px 28px 3px 0 !important;
+  }
  li {
    line-height: 1.6em;
  }

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -17,8 +17,10 @@ $white-normal: #ededed;
 $white-dark: #ececec;
 $gray-light: #fafafa;
+$gray-lighter: #f9f9f9;
 $gray-normal: #f5f5f5;
 $gray-dark: #ededed;
+$gray-darker: #eee;
 $gray-darkest: #c9c9c9;
 $green-light: #38ae67;
@@ -33,6 +35,8 @@ $blue-medium-light: #3498cb;
 $blue-medium: #2f8ebf;
 $blue-medium-dark: #2d86b4;
+$blue-light-transparent: rgba(44, 159, 216, 0.05);
 $orange-light: #fc8a51;
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;
@@ -52,6 +56,7 @@ $border-gray-light: #dcdcdc;
 $border-gray-normal: #d7d7d7;
 $border-gray-dark: #c6cacf;
+$border-green-extra-light: #9adb84;
 $border-green-light: #2faa60;
 $border-green-normal: #2ca05b;
 $border-green-dark: #279654;
@@ -91,6 +96,7 @@ $table-text-gray:       #8f8f8f;
 $gl-font-size:         15px;
 $gl-title-color:       #333;
 $gl-text-color:        #5c5c5c;
+$gl-text-color-light:  #8c8c8c;
 $gl-text-green:        #4a2;
 $gl-text-red:          #d12f19;
 $gl-text-orange:       #d90;

--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -55,68 +55,68 @@
    color: #000 !important;
  }
-  .hll { background-color: #373b41 }
+  .hll { background-color: #373b41; }
-  .c { color: #969896 } /* Comment */
+  .c { color: #969896; } /* Comment */
-  .err { color: #c66 } /* Error */
+  .err { color: #c66; } /* Error */
-  .k { color: #b294bb } /* Keyword */
+  .k { color: #b294bb; } /* Keyword */
-  .l { color: #de935f } /* Literal */
+  .l { color: #de935f; } /* Literal */
-  .n { color: #c5c8c6 } /* Name */
+  .n { color: #c5c8c6; } /* Name */
-  .o { color: #8abeb7 } /* Operator */
+  .o { color: #8abeb7; } /* Operator */
-  .p { color: #c5c8c6 } /* Punctuation */
+  .p { color: #c5c8c6; } /* Punctuation */
-  .cm { color: #969896 } /* Comment.Multiline */
+  .cm { color: #969896; } /* Comment.Multiline */
-  .cp { color: #969896 } /* Comment.Preproc */
+  .cp { color: #969896; } /* Comment.Preproc */
-  .c1 { color: #969896 } /* Comment.Single */
+  .c1 { color: #969896; } /* Comment.Single */
-  .cs { color: #969896 } /* Comment.Special */
+  .cs { color: #969896; } /* Comment.Special */
-  .gd { color: #c66 } /* Generic.Deleted */
+  .gd { color: #c66; } /* Generic.Deleted */
-  .ge { font-style: italic } /* Generic.Emph */
+  .ge { font-style: italic; } /* Generic.Emph */
-  .gh { color: #c5c8c6; font-weight: bold } /* Generic.Heading */
+  .gh { color: #c5c8c6; font-weight: bold; } /* Generic.Heading */
-  .gi { color: #b5bd68 } /* Generic.Inserted */
+  .gi { color: #b5bd68; } /* Generic.Inserted */
-  .gp { color: #969896; font-weight: bold } /* Generic.Prompt */
+  .gp { color: #969896; font-weight: bold; } /* Generic.Prompt */
-  .gs { font-weight: bold } /* Generic.Strong */
+  .gs { font-weight: bold; } /* Generic.Strong */
-  .gu { color: #8abeb7; font-weight: bold } /* Generic.Subheading */
+  .gu { color: #8abeb7; font-weight: bold; } /* Generic.Subheading */
-  .kc { color: #b294bb } /* Keyword.Constant */
+  .kc { color: #b294bb; } /* Keyword.Constant */
-  .kd { color: #b294bb } /* Keyword.Declaration */
+  .kd { color: #b294bb; } /* Keyword.Declaration */
-  .kn { color: #8abeb7 } /* Keyword.Namespace */
+  .kn { color: #8abeb7; } /* Keyword.Namespace */
-  .kp { color: #b294bb } /* Keyword.Pseudo */
+  .kp { color: #b294bb; } /* Keyword.Pseudo */
-  .kr { color: #b294bb } /* Keyword.Reserved */
+  .kr { color: #b294bb; } /* Keyword.Reserved */
-  .kt { color: #f0c674 } /* Keyword.Type */
+  .kt { color: #f0c674; } /* Keyword.Type */
-  .ld { color: #b5bd68 } /* Literal.Date */
+  .ld { color: #b5bd68; } /* Literal.Date */
-  .m { color: #de935f } /* Literal.Number */
+  .m { color: #de935f; } /* Literal.Number */
-  .s { color: #b5bd68 } /* Literal.String */
+  .s { color: #b5bd68; } /* Literal.String */
-  .na { color: #81a2be } /* Name.Attribute */
+  .na { color: #81a2be; } /* Name.Attribute */
-  .nb { color: #c5c8c6 } /* Name.Builtin */
+  .nb { color: #c5c8c6; } /* Name.Builtin */
-  .nc { color: #f0c674 } /* Name.Class */
+  .nc { color: #f0c674; } /* Name.Class */
-  .no { color: #c66 } /* Name.Constant */
+  .no { color: #c66; } /* Name.Constant */
-  .nd { color: #8abeb7 } /* Name.Decorator */
+  .nd { color: #8abeb7; } /* Name.Decorator */
-  .ni { color: #c5c8c6 } /* Name.Entity */
+  .ni { color: #c5c8c6; } /* Name.Entity */
-  .ne { color: #c66 } /* Name.Exception */
+  .ne { color: #c66; } /* Name.Exception */
-  .nf { color: #81a2be } /* Name.Function */
+  .nf { color: #81a2be; } /* Name.Function */
-  .nl { color: #c5c8c6 } /* Name.Label */
+  .nl { color: #c5c8c6; } /* Name.Label */
-  .nn { color: #f0c674 } /* Name.Namespace */
+  .nn { color: #f0c674; } /* Name.Namespace */
-  .nx { color: #81a2be } /* Name.Other */
+  .nx { color: #81a2be; } /* Name.Other */
-  .py { color: #c5c8c6 } /* Name.Property */
+  .py { color: #c5c8c6; } /* Name.Property */
-  .nt { color: #8abeb7 } /* Name.Tag */
+  .nt { color: #8abeb7; } /* Name.Tag */
-  .nv { color: #c66 } /* Name.Variable */
+  .nv { color: #c66; } /* Name.Variable */
-  .ow { color: #8abeb7 } /* Operator.Word */
+  .ow { color: #8abeb7; } /* Operator.Word */
-  .w { color: #c5c8c6 } /* Text.Whitespace */
+  .w { color: #c5c8c6; } /* Text.Whitespace */
-  .mf { color: #de935f } /* Literal.Number.Float */
+  .mf { color: #de935f; } /* Literal.Number.Float */
-  .mh { color: #de935f } /* Literal.Number.Hex */
+  .mh { color: #de935f; } /* Literal.Number.Hex */
-  .mi { color: #de935f } /* Literal.Number.Integer */
+  .mi { color: #de935f; } /* Literal.Number.Integer */
-  .mo { color: #de935f } /* Literal.Number.Oct */
+  .mo { color: #de935f; } /* Literal.Number.Oct */
-  .sb { color: #b5bd68 } /* Literal.String.Backtick */
+  .sb { color: #b5bd68; } /* Literal.String.Backtick */
-  .sc { color: #c5c8c6 } /* Literal.String.Char */
+  .sc { color: #c5c8c6; } /* Literal.String.Char */
-  .sd { color: #969896 } /* Literal.String.Doc */
+  .sd { color: #969896; } /* Literal.String.Doc */
-  .s2 { color: #b5bd68 } /* Literal.String.Double */
+  .s2 { color: #b5bd68; } /* Literal.String.Double */
-  .se { color: #de935f } /* Literal.String.Escape */
+  .se { color: #de935f; } /* Literal.String.Escape */
-  .sh { color: #b5bd68 } /* Literal.String.Heredoc */
+  .sh { color: #b5bd68; } /* Literal.String.Heredoc */
-  .si { color: #de935f } /* Literal.String.Interpol */
+  .si { color: #de935f; } /* Literal.String.Interpol */
-  .sx { color: #b5bd68 } /* Literal.String.Other */
+  .sx { color: #b5bd68; } /* Literal.String.Other */
-  .sr { color: #b5bd68 } /* Literal.String.Regex */
+  .sr { color: #b5bd68; } /* Literal.String.Regex */
-  .s1 { color: #b5bd68 } /* Literal.String.Single */
+  .s1 { color: #b5bd68; } /* Literal.String.Single */
-  .ss { color: #b5bd68 } /* Literal.String.Symbol */
+  .ss { color: #b5bd68; } /* Literal.String.Symbol */
-  .bp { color: #c5c8c6 } /* Name.Builtin.Pseudo */
+  .bp { color: #c5c8c6; } /* Name.Builtin.Pseudo */
-  .vc { color: #c66 } /* Name.Variable.Class */
+  .vc { color: #c66; } /* Name.Variable.Class */
-  .vg { color: #c66 } /* Name.Variable.Global */
+  .vg { color: #c66; } /* Name.Variable.Global */
-  .vi { color: #c66 } /* Name.Variable.Instance */
+  .vi { color: #c66; } /* Name.Variable.Instance */
-  .il { color: #de935f } /* Literal.Number.Integer.Long */
+  .il { color: #de935f; } /* Literal.Number.Integer.Long */
 }
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -55,65 +55,65 @@
    color: #000 !important;
  }
-  .hll { background-color: #49483e }
+  .hll { background-color: #49483e; }
-  .c { color: #75715e } /* Comment */
+  .c { color: #75715e; } /* Comment */
-  .err { color: #960050; background-color: #1e0010 } /* Error */
+  .err { color: #960050; background-color: #1e0010; } /* Error */
-  .k { color: #66d9ef } /* Keyword */
+  .k { color: #66d9ef; } /* Keyword */
-  .l { color: #ae81ff } /* Literal */
+  .l { color: #ae81ff; } /* Literal */
-  .n { color: #f8f8f2 } /* Name */
+  .n { color: #f8f8f2; } /* Name */
-  .o { color: #f92672 } /* Operator */
+  .o { color: #f92672; } /* Operator */
-  .p { color: #f8f8f2 } /* Punctuation */
+  .p { color: #f8f8f2; } /* Punctuation */
-  .cm { color: #75715e } /* Comment.Multiline */
+  .cm { color: #75715e; } /* Comment.Multiline */
-  .cp { color: #75715e } /* Comment.Preproc */
+  .cp { color: #75715e; } /* Comment.Preproc */
-  .c1 { color: #75715e } /* Comment.Single */
+  .c1 { color: #75715e; } /* Comment.Single */
-  .cs { color: #75715e } /* Comment.Special */
+  .cs { color: #75715e; } /* Comment.Special */
-  .ge { font-style: italic } /* Generic.Emph */
+  .ge { font-style: italic; } /* Generic.Emph */
-  .gs { font-weight: bold } /* Generic.Strong */
+  .gs { font-weight: bold; } /* Generic.Strong */
-  .kc { color: #66d9ef } /* Keyword.Constant */
+  .kc { color: #66d9ef; } /* Keyword.Constant */
-  .kd { color: #66d9ef } /* Keyword.Declaration */
+  .kd { color: #66d9ef; } /* Keyword.Declaration */
-  .kn { color: #f92672 } /* Keyword.Namespace */
+  .kn { color: #f92672; } /* Keyword.Namespace */
-  .kp { color: #66d9ef } /* Keyword.Pseudo */
+  .kp { color: #66d9ef; } /* Keyword.Pseudo */
-  .kr { color: #66d9ef } /* Keyword.Reserved */
+  .kr { color: #66d9ef; } /* Keyword.Reserved */
-  .kt { color: #66d9ef } /* Keyword.Type */
+  .kt { color: #66d9ef; } /* Keyword.Type */
-  .ld { color: #e6db74 } /* Literal.Date */
+  .ld { color: #e6db74; } /* Literal.Date */
-  .m { color: #ae81ff } /* Literal.Number */
+  .m { color: #ae81ff; } /* Literal.Number */
-  .s { color: #e6db74 } /* Literal.String */
+  .s { color: #e6db74; } /* Literal.String */
-  .na { color: #a6e22e } /* Name.Attribute */
+  .na { color: #a6e22e; } /* Name.Attribute */
-  .nb { color: #f8f8f2 } /* Name.Builtin */
+  .nb { color: #f8f8f2; } /* Name.Builtin */
-  .nc { color: #a6e22e } /* Name.Class */
+  .nc { color: #a6e22e; } /* Name.Class */
-  .no { color: #66d9ef } /* Name.Constant */
+  .no { color: #66d9ef; } /* Name.Constant */
-  .nd { color: #a6e22e } /* Name.Decorator */
+  .nd { color: #a6e22e; } /* Name.Decorator */
-  .ni { color: #f8f8f2 } /* Name.Entity */
+  .ni { color: #f8f8f2; } /* Name.Entity */
-  .ne { color: #a6e22e } /* Name.Exception */
+  .ne { color: #a6e22e; } /* Name.Exception */
-  .nf { color: #a6e22e } /* Name.Function */
+  .nf { color: #a6e22e; } /* Name.Function */
-  .nl { color: #f8f8f2 } /* Name.Label */
+  .nl { color: #f8f8f2; } /* Name.Label */
-  .nn { color: #f8f8f2 } /* Name.Namespace */
+  .nn { color: #f8f8f2; } /* Name.Namespace */
-  .nx { color: #a6e22e } /* Name.Other */
+  .nx { color: #a6e22e; } /* Name.Other */
-  .py { color: #f8f8f2 } /* Name.Property */
+  .py { color: #f8f8f2; } /* Name.Property */
-  .nt { color: #f92672 } /* Name.Tag */
+  .nt { color: #f92672; } /* Name.Tag */
-  .nv { color: #f8f8f2 } /* Name.Variable */
+  .nv { color: #f8f8f2; } /* Name.Variable */
-  .ow { color: #f92672 } /* Operator.Word */
+  .ow { color: #f92672; } /* Operator.Word */
-  .w { color: #f8f8f2 } /* Text.Whitespace */
+  .w { color: #f8f8f2; } /* Text.Whitespace */
-  .mf { color: #ae81ff } /* Literal.Number.Float */
+  .mf { color: #ae81ff; } /* Literal.Number.Float */
-  .mh { color: #ae81ff } /* Literal.Number.Hex */
+  .mh { color: #ae81ff; } /* Literal.Number.Hex */
-  .mi { color: #ae81ff } /* Literal.Number.Integer */
+  .mi { color: #ae81ff; } /* Literal.Number.Integer */
-  .mo { color: #ae81ff } /* Literal.Number.Oct */
+  .mo { color: #ae81ff; } /* Literal.Number.Oct */
-  .sb { color: #e6db74 } /* Literal.String.Backtick */
+  .sb { color: #e6db74; } /* Literal.String.Backtick */
-  .sc { color: #e6db74 } /* Literal.String.Char */
+  .sc { color: #e6db74; } /* Literal.String.Char */
-  .sd { color: #e6db74 } /* Literal.String.Doc */
+  .sd { color: #e6db74; } /* Literal.String.Doc */
-  .s2 { color: #e6db74 } /* Literal.String.Double */
+  .s2 { color: #e6db74; } /* Literal.String.Double */
-  .se { color: #ae81ff } /* Literal.String.Escape */
+  .se { color: #ae81ff; } /* Literal.String.Escape */
-  .sh { color: #e6db74 } /* Literal.String.Heredoc */
+  .sh { color: #e6db74; } /* Literal.String.Heredoc */
-  .si { color: #e6db74 } /* Literal.String.Interpol */
+  .si { color: #e6db74; } /* Literal.String.Interpol */
-  .sx { color: #e6db74 } /* Literal.String.Other */
+  .sx { color: #e6db74; } /* Literal.String.Other */
-  .sr { color: #e6db74 } /* Literal.String.Regex */
+  .sr { color: #e6db74; } /* Literal.String.Regex */
-  .s1 { color: #e6db74 } /* Literal.String.Single */
+  .s1 { color: #e6db74; } /* Literal.String.Single */
-  .ss { color: #e6db74 } /* Literal.String.Symbol */
+  .ss { color: #e6db74; } /* Literal.String.Symbol */
-  .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */
+  .bp { color: #f8f8f2; } /* Name.Builtin.Pseudo */
-  .vc { color: #f8f8f2 } /* Name.Variable.Class */
+  .vc { color: #f8f8f2; } /* Name.Variable.Class */
-  .vg { color: #f8f8f2 } /* Name.Variable.Global */
+  .vg { color: #f8f8f2; } /* Name.Variable.Global */
-  .vi { color: #f8f8f2 } /* Name.Variable.Instance */
+  .vi { color: #f8f8f2; } /* Name.Variable.Instance */
-  .il { color: #ae81ff } /* Literal.Number.Integer.Long */
+  .il { color: #ae81ff; } /* Literal.Number.Integer.Long */
  .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */
  .gd { color: #f92672; } /* Generic.Deleted & Diff Deleted */
  .gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */

--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -72,72 +72,72 @@
  green     #859900  operators, other keywords
  */
-  .c { color: #586e75 } /* Comment */
+  .c { color: #586e75; } /* Comment */
-  .err { color: #93a1a1 } /* Error */
+  .err { color: #93a1a1; } /* Error */
-  .g { color: #93a1a1 } /* Generic */
+  .g { color: #93a1a1; } /* Generic */
-  .k { color: #859900 } /* Keyword */
+  .k { color: #859900; } /* Keyword */
-  .l { color: #93a1a1 } /* Literal */
+  .l { color: #93a1a1; } /* Literal */
-  .n { color: #93a1a1 } /* Name */
+  .n { color: #93a1a1; } /* Name */
-  .o { color: #859900 } /* Operator */
+  .o { color: #859900; } /* Operator */
-  .x { color: #cb4b16 } /* Other */
+  .x { color: #cb4b16; } /* Other */
-  .p { color: #93a1a1 } /* Punctuation */
+  .p { color: #93a1a1; } /* Punctuation */
-  .cm { color: #586e75 } /* Comment.Multiline */
+  .cm { color: #586e75; } /* Comment.Multiline */
-  .cp { color: #859900 } /* Comment.Preproc */
+  .cp { color: #859900; } /* Comment.Preproc */
-  .c1 { color: #586e75 } /* Comment.Single */
+  .c1 { color: #586e75; } /* Comment.Single */
-  .cs { color: #859900 } /* Comment.Special */
+  .cs { color: #859900; } /* Comment.Special */
-  .gd { color: #2aa198 } /* Generic.Deleted */
+  .gd { color: #2aa198; } /* Generic.Deleted */
-  .ge { color: #93a1a1; font-style: italic } /* Generic.Emph */
+  .ge { color: #93a1a1; font-style: italic; } /* Generic.Emph */
-  .gr { color: #dc322f } /* Generic.Error */
+  .gr { color: #dc322f; } /* Generic.Error */
-  .gh { color: #cb4b16 } /* Generic.Heading */
+  .gh { color: #cb4b16; } /* Generic.Heading */
-  .gi { color: #859900 } /* Generic.Inserted */
+  .gi { color: #859900; } /* Generic.Inserted */
-  .go { color: #93a1a1 } /* Generic.Output */
+  .go { color: #93a1a1; } /* Generic.Output */
-  .gp { color: #93a1a1 } /* Generic.Prompt */
+  .gp { color: #93a1a1; } /* Generic.Prompt */
-  .gs { color: #93a1a1; font-weight: bold } /* Generic.Strong */
+  .gs { color: #93a1a1; font-weight: bold; } /* Generic.Strong */
-  .gu { color: #cb4b16 } /* Generic.Subheading */
+  .gu { color: #cb4b16; } /* Generic.Subheading */
-  .gt { color: #93a1a1 } /* Generic.Traceback */
+  .gt { color: #93a1a1; } /* Generic.Traceback */
-  .kc { color: #cb4b16 } /* Keyword.Constant */
+  .kc { color: #cb4b16; } /* Keyword.Constant */
-  .kd { color: #268bd2 } /* Keyword.Declaration */
+  .kd { color: #268bd2; } /* Keyword.Declaration */
-  .kn { color: #859900 } /* Keyword.Namespace */
+  .kn { color: #859900; } /* Keyword.Namespace */
-  .kp { color: #859900 } /* Keyword.Pseudo */
+  .kp { color: #859900; } /* Keyword.Pseudo */
-  .kr { color: #268bd2 } /* Keyword.Reserved */
+  .kr { color: #268bd2; } /* Keyword.Reserved */
-  .kt { color: #dc322f } /* Keyword.Type */
+  .kt { color: #dc322f; } /* Keyword.Type */
-  .ld { color: #93a1a1 } /* Literal.Date */
+  .ld { color: #93a1a1; } /* Literal.Date */
-  .m { color: #2aa198 } /* Literal.Number */
+  .m { color: #2aa198; } /* Literal.Number */
-  .s { color: #2aa198 } /* Literal.String */
+  .s { color: #2aa198; } /* Literal.String */
-  .na { color: #93a1a1 } /* Name.Attribute */
+  .na { color: #93a1a1; } /* Name.Attribute */
-  .nb { color: #b58900 } /* Name.Builtin */
+  .nb { color: #b58900; } /* Name.Builtin */
-  .nc { color: #268bd2 } /* Name.Class */
+  .nc { color: #268bd2; } /* Name.Class */
-  .no { color: #cb4b16 } /* Name.Constant */
+  .no { color: #cb4b16; } /* Name.Constant */
-  .nd { color: #268bd2 } /* Name.Decorator */
+  .nd { color: #268bd2; } /* Name.Decorator */
-  .ni { color: #cb4b16 } /* Name.Entity */
+  .ni { color: #cb4b16; } /* Name.Entity */
-  .ne { color: #cb4b16 } /* Name.Exception */
+  .ne { color: #cb4b16; } /* Name.Exception */
-  .nf { color: #268bd2 } /* Name.Function */
+  .nf { color: #268bd2; } /* Name.Function */
-  .nl { color: #93a1a1 } /* Name.Label */
+  .nl { color: #93a1a1; } /* Name.Label */
-  .nn { color: #93a1a1 } /* Name.Namespace */
+  .nn { color: #93a1a1; } /* Name.Namespace */
-  .nx { color: #93a1a1 } /* Name.Other */
+  .nx { color: #93a1a1; } /* Name.Other */
-  .py { color: #93a1a1 } /* Name.Property */
+  .py { color: #93a1a1; } /* Name.Property */
-  .nt { color: #268bd2 } /* Name.Tag */
+  .nt { color: #268bd2; } /* Name.Tag */
-  .nv { color: #268bd2 } /* Name.Variable */
+  .nv { color: #268bd2; } /* Name.Variable */
-  .ow { color: #859900 } /* Operator.Word */
+  .ow { color: #859900; } /* Operator.Word */
-  .w { color: #93a1a1 } /* Text.Whitespace */
+  .w { color: #93a1a1; } /* Text.Whitespace */
-  .mf { color: #2aa198 } /* Literal.Number.Float */
+  .mf { color: #2aa198; } /* Literal.Number.Float */
-  .mh { color: #2aa198 } /* Literal.Number.Hex */
+  .mh { color: #2aa198; } /* Literal.Number.Hex */
-  .mi { color: #2aa198 } /* Literal.Number.Integer */
+  .mi { color: #2aa198; } /* Literal.Number.Integer */
-  .mo { color: #2aa198 } /* Literal.Number.Oct */
+  .mo { color: #2aa198; } /* Literal.Number.Oct */
-  .sb { color: #586e75 } /* Literal.String.Backtick */
+  .sb { color: #586e75; } /* Literal.String.Backtick */
-  .sc { color: #2aa198 } /* Literal.String.Char */
+  .sc { color: #2aa198; } /* Literal.String.Char */
-  .sd { color: #93a1a1 } /* Literal.String.Doc */
+  .sd { color: #93a1a1; } /* Literal.String.Doc */
-  .s2 { color: #2aa198 } /* Literal.String.Double */
+  .s2 { color: #2aa198; } /* Literal.String.Double */
-  .se { color: #cb4b16 } /* Literal.String.Escape */
+  .se { color: #cb4b16; } /* Literal.String.Escape */
-  .sh { color: #93a1a1 } /* Literal.String.Heredoc */
+  .sh { color: #93a1a1; } /* Literal.String.Heredoc */
-  .si { color: #2aa198 } /* Literal.String.Interpol */
+  .si { color: #2aa198; } /* Literal.String.Interpol */
-  .sx { color: #2aa198 } /* Literal.String.Other */
+  .sx { color: #2aa198; } /* Literal.String.Other */
-  .sr { color: #dc322f } /* Literal.String.Regex */
+  .sr { color: #dc322f; } /* Literal.String.Regex */
-  .s1 { color: #2aa198 } /* Literal.String.Single */
+  .s1 { color: #2aa198; } /* Literal.String.Single */
-  .ss { color: #2aa198 } /* Literal.String.Symbol */
+  .ss { color: #2aa198; } /* Literal.String.Symbol */
-  .bp { color: #268bd2 } /* Name.Builtin.Pseudo */
+  .bp { color: #268bd2; } /* Name.Builtin.Pseudo */
-  .vc { color: #268bd2 } /* Name.Variable.Class */
+  .vc { color: #268bd2; } /* Name.Variable.Class */
-  .vg { color: #268bd2 } /* Name.Variable.Global */
+  .vg { color: #268bd2; } /* Name.Variable.Global */
-  .vi { color: #268bd2 } /* Name.Variable.Instance */
+  .vi { color: #268bd2; } /* Name.Variable.Instance */
-  .il { color: #2aa198 } /* Literal.Number.Integer.Long */
+  .il { color: #2aa198; } /* Literal.Number.Integer.Long */
 }
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -86,7 +86,7 @@
    background-color: #fafe3d !important;
  }
-  .hll { background-color: #f8f8f8 }
+  .hll { background-color: #f8f8f8; }
  .c { color: #998; font-style: italic; }
  .err { color: #a61717; background-color: #e3d2d2; }
  .k { font-weight: bold; }

--- a/app/assets/stylesheets/mailers/repository_push_email.scss
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -78,7 +78,7 @@ span.highlight_word {
  background-color: #fafe3d !important;
 }
-.hll { background-color: #f8f8f8 }
+.hll { background-color: #f8f8f8; }
 .c { color: #998; font-style: italic; }
 .err { color: #a61717; background-color: #e3d2d2; }
 .k { font-weight: bold; }

--- a/app/assets/stylesheets/notify.scss
+++ b/app/assets/stylesheets/notify.scss
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -161,6 +161,7 @@
 .branch-commit {
  color: $gl-gray;
  .commit-id, .commit-row-message {
    color: $gl-gray;
  }

--- a/app/assets/stylesheets/pages/dashboard.scss
+++ b/app/assets/stylesheets/pages/dashboard.scss
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
--- a/app/assets/stylesheets/pages/lint.scss
+++ b/app/assets/stylesheets/pages/lint.scss
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
--- a/app/assets/stylesheets/pages/runners.scss
+++ b/app/assets/stylesheets/pages/runners.scss
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
--- a/app/assets/stylesheets/pages/xterm.scss
+++ b/app/assets/stylesheets/pages/xterm.scss
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
--- a/app/controllers/namespaces_controller.rb
+++ b/app/controllers/namespaces_controller.rb
--- a/app/controllers/projects/board_lists_controller.rb
+++ b/app/controllers/projects/board_lists_controller.rb
--- a/app/controllers/projects/boards/issues_controller.rb
+++ b/app/controllers/projects/boards/issues_controller.rb
--- a/app/controllers/projects/boards/lists_controller.rb
+++ b/app/controllers/projects/boards/lists_controller.rb
--- a/app/controllers/projects/boards_controller.rb
+++ b/app/controllers/projects/boards_controller.rb
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
--- a/app/finders/trending_projects_finder.rb
+++ b/app/finders/trending_projects_finder.rb
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
--- a/app/models/compare.rb
+++ b/app/models/compare.rb
--- a/app/models/cycle_analytics.rb
+++ b/app/models/cycle_analytics.rb
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
--- a/app/models/event.rb
+++ b/app/models/event.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
--- a/app/models/project.rb
+++ b/app/models/project.rb
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
--- a/app/models/trending_project.rb
+++ b/app/models/trending_project.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
--- a/app/services/boards/base_service.rb
+++ b/app/services/boards/base_service.rb
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
--- a/app/services/boards/issues/create_service.rb
+++ b/app/services/boards/issues/create_service.rb
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
--- a/app/services/boards/list_service.rb
+++ b/app/services/boards/list_service.rb
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
--- a/app/services/boards/lists/destroy_service.rb
+++ b/app/services/boards/lists/destroy_service.rb
--- a/app/services/boards/lists/generate_service.rb
+++ b/app/services/boards/lists/generate_service.rb
--- a/app/services/boards/lists/list_service.rb
+++ b/app/services/boards/lists/list_service.rb
--- a/app/services/boards/lists/move_service.rb
+++ b/app/services/boards/lists/move_service.rb
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
--- a/app/services/create_deployment_service.rb
+++ b/app/services/create_deployment_service.rb
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
--- a/app/services/merge_requests/add_todo_when_build_fails_service.rb
+++ b/app/services/merge_requests/add_todo_when_build_fails_service.rb
--- a/app/services/merge_requests/assign_issues_service.rb
+++ b/app/services/merge_requests/assign_issues_service.rb
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
--- a/app/services/merge_requests/resolve_service.rb
+++ b/app/services/merge_requests/resolve_service.rb
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/services/slash_commands/interpret_service.rb
+++ b/app/services/slash_commands/interpret_service.rb
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/namespace_validator.rb
--- a/app/views/admin/appearances/preview.html.haml
+++ b/app/views/admin/appearances/preview.html.haml
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
--- a/app/views/devise/sessions/_new_crowd.html.haml
+++ b/app/views/devise/sessions/_new_crowd.html.haml
--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
--- a/app/views/devise/shared/_sign_in_link.html.haml
+++ b/app/views/devise/shared/_sign_in_link.html.haml
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
--- a/app/views/devise/shared/_tab_single.html.haml
+++ b/app/views/devise/shared/_tab_single.html.haml
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
--- a/app/views/devise/shared/_tabs_normal.html.haml
+++ b/app/views/devise/shared/_tabs_normal.html.haml
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
--- a/app/views/groups/group_members/_new_group_member.html.haml
+++ b/app/views/groups/group_members/_new_group_member.html.haml
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
--- a/app/views/groups/group_members/update.js.haml
+++ b/app/views/groups/group_members/update.js.haml
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
--- a/app/views/projects/boards/index.html.haml
+++ b/app/views/projects/boards/index.html.haml
--- a/app/views/projects/boards/show.html.haml
+++ b/app/views/projects/boards/show.html.haml
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
--- a/app/views/projects/builds/_table.html.haml
+++ b/app/views/projects/builds/_table.html.haml
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
--- a/app/views/projects/commit/_pipeline_stage.html.haml
+++ b/app/views/projects/commit/_pipeline_stage.html.haml
--- a/app/views/projects/commit/_pipeline_status_group.html.haml
+++ b/app/views/projects/commit/_pipeline_status_group.html.haml
--- a/app/views/projects/commit/_pipelines_list.haml
+++ b/app/views/projects/commit/_pipelines_list.haml
--- a/app/views/projects/commit/builds.html.haml
+++ b/app/views/projects/commit/builds.html.haml
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
--- a/app/views/projects/compare/_ref_dropdown.html.haml
+++ b/app/views/projects/compare/_ref_dropdown.html.haml
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
--- a/app/views/projects/environments/edit.html.haml
+++ b/app/views/projects/environments/edit.html.haml
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
--- a/app/views/projects/environments/new.html.haml
+++ b/app/views/projects/environments/new.html.haml
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
--- a/app/views/projects/group_links/update.js.haml
+++ b/app/views/projects/group_links/update.js.haml
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
--- a/app/views/projects/labels/edit.html.haml
+++ b/app/views/projects/labels/edit.html.haml
--- a/app/views/projects/labels/new.html.haml
+++ b/app/views/projects/labels/new.html.haml
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
--- a/app/views/projects/merge_requests/conflicts.html.haml
+++ b/app/views/projects/merge_requests/conflicts.html.haml
--- a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
--- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
--- a/app/views/projects/merge_requests/conflicts/_inline_view.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_inline_view.html.haml
--- a/app/views/projects/merge_requests/conflicts/_parallel_view.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_parallel_view.html.haml
--- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
--- a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml
+++ b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml
--- a/app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
+++ b/app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
--- a/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
+++ b/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
--- a/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
+++ b/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
--- a/app/views/projects/merge_requests/show/_versions.html.haml
+++ b/app/views/projects/merge_requests/show/_versions.html.haml
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
--- a/app/views/projects/milestones/edit.html.haml
+++ b/app/views/projects/milestones/edit.html.haml
--- a/app/views/projects/milestones/new.html.haml
+++ b/app/views/projects/milestones/new.html.haml
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
--- a/app/views/projects/notes/_notes_with_form.html.haml
+++ b/app/views/projects/notes/_notes_with_form.html.haml
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
--- a/app/views/projects/project_members/_groups.html.haml
+++ b/app/views/projects/project_members/_groups.html.haml
--- a/app/views/projects/project_members/_new_project_member.html.haml
+++ b/app/views/projects/project_members/_new_project_member.html.haml
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
--- a/app/views/projects/project_members/update.js.haml
+++ b/app/views/projects/project_members/update.js.haml
--- a/app/views/shared/icons/_illustration_no_commits.svg
+++ b/app/views/shared/icons/_illustration_no_commits.svg
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
--- a/app/views/shared/issuable/_milestone_dropdown.html.haml
+++ b/app/views/shared/issuable/_milestone_dropdown.html.haml
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
--- a/app/views/shared/members/_group.html.haml
+++ b/app/views/shared/members/_group.html.haml
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
--- a/app/views/shared/members/_requests.html.haml
+++ b/app/views/shared/members/_requests.html.haml
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
--- a/app/views/u2f/_authenticate.html.haml
+++ b/app/views/u2f/_authenticate.html.haml
--- a/app/workers/build_coverage_worker.rb
+++ b/app/workers/build_coverage_worker.rb
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
--- a/app/workers/build_hooks_worker.rb
+++ b/app/workers/build_hooks_worker.rb
--- a/app/workers/build_success_worker.rb
+++ b/app/workers/build_success_worker.rb
--- a/app/workers/pipeline_hooks_worker.rb
+++ b/app/workers/pipeline_hooks_worker.rb
--- a/app/workers/pipeline_metrics_worker.rb
+++ b/app/workers/pipeline_metrics_worker.rb
--- a/app/workers/process_pipeline_worker.rb
+++ b/app/workers/process_pipeline_worker.rb
--- a/app/workers/pipeline_success_worker.rb
+++ b/app/workers/pipeline_success_worker.rb
--- a/app/workers/update_pipeline_worker.rb
+++ b/app/workers/update_pipeline_worker.rb
--- a/app/workers/trending_projects_worker.rb
+++ b/app/workers/trending_projects_worker.rb
--- a/app/workers/update_merge_requests_worker.rb
+++ b/app/workers/update_merge_requests_worker.rb
--- a/config/application.rb
+++ b/config/application.rb
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
--- a/config/routes/snippets.rb
+++ b/config/routes/snippets.rb
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
--- a/db/migrate/20161007133303_precalculate_trending_projects.rb
+++ b/db/migrate/20161007133303_precalculate_trending_projects.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/administration/high_availability/gitlab.md
+++ b/doc/administration/high_availability/gitlab.md
--- a/doc/administration/monitoring/performance/gitlab_configuration.md
+++ b/doc/administration/monitoring/performance/gitlab_configuration.md
--- a/doc/administration/monitoring/performance/grafana_configuration.md
+++ b/doc/administration/monitoring/performance/grafana_configuration.md
--- a/doc/administration/monitoring/performance/img/grafana_dashboard_dropdown.png
+++ b/doc/administration/monitoring/performance/img/grafana_dashboard_dropdown.png
--- a/doc/administration/monitoring/performance/img/grafana_dashboard_import.png
+++ b/doc/administration/monitoring/performance/img/grafana_dashboard_import.png
--- a/doc/administration/monitoring/performance/img/grafana_data_source_configuration.png
+++ b/doc/administration/monitoring/performance/img/grafana_data_source_configuration.png
--- a/doc/administration/monitoring/performance/img/grafana_data_source_empty.png
+++ b/doc/administration/monitoring/performance/img/grafana_data_source_empty.png
--- a/doc/administration/monitoring/performance/img/grafana_save_icon.png
+++ b/doc/administration/monitoring/performance/img/grafana_save_icon.png
--- a/doc/administration/monitoring/performance/img/metrics_gitlab_configuration_settings.png
+++ b/doc/administration/monitoring/performance/img/metrics_gitlab_configuration_settings.png
--- a/doc/administration/monitoring/performance/img/request_profile_result.png
+++ b/doc/administration/monitoring/performance/img/request_profile_result.png
--- a/doc/administration/monitoring/performance/img/request_profiling_token.png
+++ b/doc/administration/monitoring/performance/img/request_profiling_token.png
--- a/doc/administration/monitoring/performance/influxdb_configuration.md
+++ b/doc/administration/monitoring/performance/influxdb_configuration.md
--- a/doc/administration/monitoring/performance/influxdb_schema.md
+++ b/doc/administration/monitoring/performance/influxdb_schema.md
--- a/doc/administration/monitoring/performance/introduction.md
+++ b/doc/administration/monitoring/performance/introduction.md
--- a/doc/administration/monitoring/performance/request_profiling.md
+++ b/doc/administration/monitoring/performance/request_profiling.md
--- a/doc/administration/operations.md
+++ b/doc/administration/operations.md
--- a/doc/administration/operations/cleaning_up_redis_sessions.md
+++ b/doc/administration/operations/cleaning_up_redis_sessions.md
--- a/doc/administration/operations/moving_repositories.md
+++ b/doc/administration/operations/moving_repositories.md
--- a/doc/administration/operations/sidekiq_memory_killer.md
+++ b/doc/administration/operations/sidekiq_memory_killer.md
--- a/doc/administration/operations/unicorn.md
+++ b/doc/administration/operations/unicorn.md
--- a/doc/administration/reply_by_email.md
+++ b/doc/administration/reply_by_email.md
--- a/doc/administration/reply_by_email_postfix_setup.md
+++ b/doc/administration/reply_by_email_postfix_setup.md
--- a/doc/administration/restart_gitlab.md
+++ b/doc/administration/restart_gitlab.md
--- a/doc/administration/troubleshooting/debug.md
+++ b/doc/administration/troubleshooting/debug.md
--- a/doc/api/README.md
+++ b/doc/api/README.md
--- a/doc/api/award_emoji.md
+++ b/doc/api/award_emoji.md
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
--- a/doc/api/deployments.md
+++ b/doc/api/deployments.md
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
--- a/doc/api/keys.md
+++ b/doc/api/keys.md
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.md
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
--- a/doc/api/templates/gitignores.md
+++ b/doc/api/templates/gitignores.md
--- a/doc/api/templates/gitlab_ci_ymls.md
+++ b/doc/api/templates/gitlab_ci_ymls.md
--- a/doc/api/licenses.md
+++ b/doc/api/licenses.md
--- a/doc/api/todos.md
+++ b/doc/api/todos.md
--- a/doc/api/users.md
+++ b/doc/api/users.md
--- a/doc/api/version.md
+++ b/doc/api/version.md
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
--- a/doc/ci/examples/test-phoenix-application.md
+++ b/doc/ci/examples/test-phoenix-application.md
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
--- a/doc/development/frontend.md
+++ b/doc/development/frontend.md
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
--- a/doc/gitlab-basics/README.md
+++ b/doc/gitlab-basics/README.md
--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
--- a/doc/gitlab-basics/add-merge-request.md
+++ b/doc/gitlab-basics/add-merge-request.md
--- a/doc/gitlab-basics/basicsimages/add_new_merge_request.png
+++ b/doc/gitlab-basics/basicsimages/add_new_merge_request.png
--- a/doc/gitlab-basics/basicsimages/add_sshkey.png
+++ b/doc/gitlab-basics/basicsimages/add_sshkey.png
--- a/doc/gitlab-basics/basicsimages/branch_info.png
+++ b/doc/gitlab-basics/basicsimages/branch_info.png
--- a/doc/gitlab-basics/basicsimages/branch_name.png
+++ b/doc/gitlab-basics/basicsimages/branch_name.png
--- a/doc/gitlab-basics/basicsimages/branches.png
+++ b/doc/gitlab-basics/basicsimages/branches.png
--- a/doc/gitlab-basics/basicsimages/button-create-mr.png
+++ b/doc/gitlab-basics/basicsimages/button-create-mr.png
--- a/doc/gitlab-basics/basicsimages/click-on-new-group.png
+++ b/doc/gitlab-basics/basicsimages/click-on-new-group.png
--- a/doc/gitlab-basics/basicsimages/commit_changes.png
+++ b/doc/gitlab-basics/basicsimages/commit_changes.png
--- a/doc/gitlab-basics/basicsimages/commit_message.png
+++ b/doc/gitlab-basics/basicsimages/commit_message.png
--- a/doc/gitlab-basics/basicsimages/commits.png
+++ b/doc/gitlab-basics/basicsimages/commits.png
--- a/doc/gitlab-basics/basicsimages/compare_branches.png
+++ b/doc/gitlab-basics/basicsimages/compare_branches.png
--- a/doc/gitlab-basics/basicsimages/create_file.png
+++ b/doc/gitlab-basics/basicsimages/create_file.png
--- a/doc/gitlab-basics/basicsimages/create_group.png
+++ b/doc/gitlab-basics/basicsimages/create_group.png
--- a/doc/gitlab-basics/basicsimages/edit_file.png
+++ b/doc/gitlab-basics/basicsimages/edit_file.png
--- a/doc/gitlab-basics/basicsimages/file_located.png
+++ b/doc/gitlab-basics/basicsimages/file_located.png
--- a/doc/gitlab-basics/basicsimages/file_name.png
+++ b/doc/gitlab-basics/basicsimages/file_name.png
--- a/doc/gitlab-basics/basicsimages/find_file.png
+++ b/doc/gitlab-basics/basicsimages/find_file.png
--- a/doc/gitlab-basics/basicsimages/find_group.png
+++ b/doc/gitlab-basics/basicsimages/find_group.png
--- a/doc/gitlab-basics/basicsimages/fork.png
+++ b/doc/gitlab-basics/basicsimages/fork.png
--- a/doc/gitlab-basics/basicsimages/group_info.png
+++ b/doc/gitlab-basics/basicsimages/group_info.png
--- a/doc/gitlab-basics/basicsimages/groups.png
+++ b/doc/gitlab-basics/basicsimages/groups.png
--- a/doc/gitlab-basics/basicsimages/https.png
+++ b/doc/gitlab-basics/basicsimages/https.png
--- a/doc/gitlab-basics/basicsimages/image_file.png
+++ b/doc/gitlab-basics/basicsimages/image_file.png
--- a/doc/gitlab-basics/basicsimages/issue_title.png
+++ b/doc/gitlab-basics/basicsimages/issue_title.png
--- a/doc/gitlab-basics/basicsimages/issues.png
+++ b/doc/gitlab-basics/basicsimages/issues.png
--- a/doc/gitlab-basics/basicsimages/key.png
+++ b/doc/gitlab-basics/basicsimages/key.png
--- a/doc/gitlab-basics/basicsimages/merge_requests.png
+++ b/doc/gitlab-basics/basicsimages/merge_requests.png
--- a/doc/gitlab-basics/basicsimages/new_issue.png
+++ b/doc/gitlab-basics/basicsimages/new_issue.png
--- a/doc/gitlab-basics/basicsimages/new_merge_request.png
+++ b/doc/gitlab-basics/basicsimages/new_merge_request.png
--- a/doc/gitlab-basics/basicsimages/new_project.png
+++ b/doc/gitlab-basics/basicsimages/new_project.png
--- a/doc/gitlab-basics/basicsimages/newbranch.png
+++ b/doc/gitlab-basics/basicsimages/newbranch.png
--- a/doc/gitlab-basics/basicsimages/paste_sshkey.png
+++ b/doc/gitlab-basics/basicsimages/paste_sshkey.png
--- a/doc/gitlab-basics/basicsimages/profile_settings.png
+++ b/doc/gitlab-basics/basicsimages/profile_settings.png
--- a/doc/gitlab-basics/basicsimages/project_info.png
+++ b/doc/gitlab-basics/basicsimages/project_info.png
--- a/doc/gitlab-basics/basicsimages/select-group.png
+++ b/doc/gitlab-basics/basicsimages/select-group.png
--- a/doc/gitlab-basics/basicsimages/select-group2.png
+++ b/doc/gitlab-basics/basicsimages/select-group2.png
--- a/doc/gitlab-basics/basicsimages/select_branch.png
+++ b/doc/gitlab-basics/basicsimages/select_branch.png
--- a/doc/gitlab-basics/basicsimages/select_project.png
+++ b/doc/gitlab-basics/basicsimages/select_project.png
--- a/doc/gitlab-basics/basicsimages/settings.png
+++ b/doc/gitlab-basics/basicsimages/settings.png
--- a/doc/gitlab-basics/basicsimages/shh_keys.png
+++ b/doc/gitlab-basics/basicsimages/shh_keys.png
--- a/doc/gitlab-basics/basicsimages/submit_new_issue.png
+++ b/doc/gitlab-basics/basicsimages/submit_new_issue.png
--- a/doc/gitlab-basics/basicsimages/title_description_mr.png
+++ b/doc/gitlab-basics/basicsimages/title_description_mr.png
--- a/doc/gitlab-basics/basicsimages/white_space.png
+++ b/doc/gitlab-basics/basicsimages/white_space.png
--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
--- a/doc/gitlab-basics/create-branch.md
+++ b/doc/gitlab-basics/create-branch.md
--- a/doc/gitlab-basics/create-group.md
+++ b/doc/gitlab-basics/create-group.md
--- a/doc/gitlab-basics/create-issue.md
+++ b/doc/gitlab-basics/create-issue.md
--- a/doc/gitlab-basics/create-project.md
+++ b/doc/gitlab-basics/create-project.md
--- a/doc/gitlab-basics/create-your-ssh-keys.md
+++ b/doc/gitlab-basics/create-your-ssh-keys.md
--- a/doc/gitlab-basics/fork-project.md
+++ b/doc/gitlab-basics/fork-project.md
--- a/doc/gitlab-basics/img/create_new_group_info.png
+++ b/doc/gitlab-basics/img/create_new_group_info.png
--- a/doc/gitlab-basics/img/create_new_group_sidebar.png
+++ b/doc/gitlab-basics/img/create_new_group_sidebar.png
--- a/doc/gitlab-basics/img/create_new_project_button.png
+++ b/doc/gitlab-basics/img/create_new_project_button.png
--- a/doc/gitlab-basics/img/create_new_project_from_group.png
+++ b/doc/gitlab-basics/img/create_new_project_from_group.png
--- a/doc/gitlab-basics/img/create_new_project_info.png
+++ b/doc/gitlab-basics/img/create_new_project_info.png
--- a/doc/gitlab-basics/img/fork_choose_namespace.png
+++ b/doc/gitlab-basics/img/fork_choose_namespace.png
--- a/doc/gitlab-basics/img/fork_new.png
+++ b/doc/gitlab-basics/img/fork_new.png
--- a/doc/gitlab-basics/img/merge_request_new.png
+++ b/doc/gitlab-basics/img/merge_request_new.png
--- a/doc/gitlab-basics/img/merge_request_page.png
+++ b/doc/gitlab-basics/img/merge_request_page.png
--- a/doc/gitlab-basics/img/merge_request_select_branch.png
+++ b/doc/gitlab-basics/img/merge_request_select_branch.png
--- a/doc/gitlab-basics/img/new_issue_button.png
+++ b/doc/gitlab-basics/img/new_issue_button.png
--- a/doc/gitlab-basics/img/new_issue_page.png
+++ b/doc/gitlab-basics/img/new_issue_page.png
--- a/doc/gitlab-basics/img/profile_settings.png
+++ b/doc/gitlab-basics/img/profile_settings.png
--- a/doc/gitlab-basics/img/profile_settings_ssh_keys.png
+++ b/doc/gitlab-basics/img/profile_settings_ssh_keys.png
--- a/doc/gitlab-basics/img/profile_settings_ssh_keys_paste_pub.png
+++ b/doc/gitlab-basics/img/profile_settings_ssh_keys_paste_pub.png
--- a/doc/gitlab-basics/img/profile_settings_ssh_keys_single_key.png
+++ b/doc/gitlab-basics/img/profile_settings_ssh_keys_single_key.png
--- a/doc/gitlab-basics/img/profile_settings_ssh_keys_title.png
+++ b/doc/gitlab-basics/img/profile_settings_ssh_keys_title.png
--- a/doc/gitlab-basics/img/project_clone_url.png
+++ b/doc/gitlab-basics/img/project_clone_url.png
--- a/doc/gitlab-basics/img/project_navbar.png
+++ b/doc/gitlab-basics/img/project_navbar.png
--- a/doc/gitlab-basics/basicsimages/public_file_link.png
+++ b/doc/gitlab-basics/basicsimages/public_file_link.png
--- a/doc/gitlab-basics/img/select_group_dropdown.png
+++ b/doc/gitlab-basics/img/select_group_dropdown.png
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
--- a/doc/incoming_email/postfix.md
+++ b/doc/incoming_email/postfix.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
--- a/doc/monitoring/performance/gitlab_configuration.md
+++ b/doc/monitoring/performance/gitlab_configuration.md
--- a/doc/monitoring/performance/grafana_configuration.md
+++ b/doc/monitoring/performance/grafana_configuration.md
--- a/doc/monitoring/performance/influxdb_configuration.md
+++ b/doc/monitoring/performance/influxdb_configuration.md
--- a/doc/monitoring/performance/influxdb_schema.md
+++ b/doc/monitoring/performance/influxdb_schema.md
--- a/doc/monitoring/performance/introduction.md
+++ b/doc/monitoring/performance/introduction.md
--- a/doc/operations/README.md
+++ b/doc/operations/README.md
--- a/doc/operations/cleaning_up_redis_sessions.md
+++ b/doc/operations/cleaning_up_redis_sessions.md
--- a/doc/operations/moving_repositories.md
+++ b/doc/operations/moving_repositories.md
--- a/doc/operations/sidekiq_memory_killer.md
+++ b/doc/operations/sidekiq_memory_killer.md
--- a/doc/operations/unicorn.md
+++ b/doc/operations/unicorn.md
--- a/doc/raketasks/backup_hrz.png
+++ b/doc/raketasks/backup_hrz.png
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
--- a/doc/university/README.md
+++ b/doc/university/README.md
--- a/doc/university/bookclub/booklist.md
+++ b/doc/university/bookclub/booklist.md
--- a/doc/university/bookclub/index.md
+++ b/doc/university/bookclub/index.md
--- a/doc/update/8.12-to-8.13.md
+++ b/doc/update/8.12-to-8.13.md
--- a/doc/user/admin_area/monitoring/health_check.md
+++ b/doc/user/admin_area/monitoring/health_check.md
--- a/doc/monitoring/img/health_check_token.png
+++ b/doc/monitoring/img/health_check_token.png
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
--- a/doc/user/project/cycle_analytics.md
+++ b/doc/user/project/cycle_analytics.md
--- a/doc/user/project/git_attributes.md
+++ b/doc/user/project/git_attributes.md
--- a/doc/user/project/merge_requests/img/versions-compare.png
+++ b/doc/user/project/merge_requests/img/versions-compare.png
--- a/doc/user/project/merge_requests/img/versions-dropdown.png
+++ b/doc/user/project/merge_requests/img/versions-dropdown.png
--- a/doc/user/project/merge_requests/img/versions_system_note.png
+++ b/doc/user/project/merge_requests/img/versions_system_note.png
--- a/doc/user/project/merge_requests/merge_when_build_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_build_succeeds.md
--- a/doc/user/project/merge_requests/versions.md
+++ b/doc/user/project/merge_requests/versions.md
--- a/doc/user/project/new_ci_build_permissions_model.md
+++ b/doc/user/project/new_ci_build_permissions_model.md
--- a/doc/user/project/repository/img/web_editor_new_branch_from_issue.png
+++ b/doc/user/project/repository/img/web_editor_new_branch_from_issue.png
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
--- a/doc/workflow/importing/migrating_from_svn.md
+++ b/doc/workflow/importing/migrating_from_svn.md
--- a/docker/README.md
+++ b/docker/README.md
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
--- a/features/groups.feature
+++ b/features/groups.feature
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
--- a/features/steps/admin/projects.rb
+++ b/features/steps/admin/projects.rb
--- a/features/steps/group/members.rb
+++ b/features/steps/group/members.rb
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
--- a/features/steps/project/graph.rb
+++ b/features/steps/project/graph.rb
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
--- a/features/support/db_cleaner.rb
+++ b/features/support/db_cleaner.rb
--- a/features/support/rerun.rb
+++ b/features/support/rerun.rb
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
--- a/lib/api/boards.rb
+++ b/lib/api/boards.rb
--- a/lib/api/license_templates.rb
+++ b/lib/api/license_templates.rb
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
--- a/lib/api/system_hooks.rb
+++ b/lib/api/system_hooks.rb
--- a/lib/api/templates.rb
+++ b/lib/api/templates.rb
--- a/lib/api/todos.rb
+++ b/lib/api/todos.rb
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
--- a/lib/api/version.rb
+++ b/lib/api/version.rb
--- a/lib/banzai/filter/emoji_filter.rb
+++ b/lib/banzai/filter/emoji_filter.rb
--- a/lib/banzai/filter/set_direction_filter.rb
+++ b/lib/banzai/filter/set_direction_filter.rb
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
--- a/lib/gitlab/conflict/file.rb
+++ b/lib/gitlab/conflict/file.rb
--- a/lib/gitlab/conflict/file_collection.rb
+++ b/lib/gitlab/conflict/file_collection.rb
--- a/lib/gitlab/conflict/parser.rb
+++ b/lib/gitlab/conflict/parser.rb
--- a/lib/gitlab/conflict/resolution_error.rb
+++ b/lib/gitlab/conflict/resolution_error.rb
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
--- a/lib/tasks/ce_to_ee_merge_check.rake
+++ b/lib/tasks/ce_to_ee_merge_check.rake
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/lib/tasks/gitlab/dev.rake
+++ b/lib/tasks/gitlab/dev.rake
--- a/lib/tasks/gitlab/users.rake
+++ b/lib/tasks/gitlab/users.rake
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
--- a/spec/controllers/namespaces_controller_spec.rb
+++ b/spec/controllers/namespaces_controller_spec.rb
--- a/spec/controllers/projects/boards/issues_controller_spec.rb
+++ b/spec/controllers/projects/boards/issues_controller_spec.rb
--- a/spec/controllers/projects/boards/lists_controller_spec.rb
+++ b/spec/controllers/projects/boards/lists_controller_spec.rb
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
--- a/spec/controllers/projects/graphs_controller_spec.rb
+++ b/spec/controllers/projects/graphs_controller_spec.rb
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
--- a/spec/controllers/projects/tags_controller_spec.rb
+++ b/spec/controllers/projects/tags_controller_spec.rb
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
--- a/spec/features/atom/users_spec.rb
+++ b/spec/features/atom/users_spec.rb
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
--- a/spec/features/boards/keyboard_shortcut_spec.rb
+++ b/spec/features/boards/keyboard_shortcut_spec.rb
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
--- a/spec/features/compare_spec.rb
+++ b/spec/features/compare_spec.rb
--- a/spec/features/groups/members/owner_manages_access_requests_spec.rb
+++ b/spec/features/groups/members/owner_manages_access_requests_spec.rb
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
--- a/spec/features/merge_requests/assign_issues_spec.rb
+++ b/spec/features/merge_requests/assign_issues_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/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
--- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb
+++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
--- a/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
--- a/spec/features/projects/files/find_file_keyboard_spec.rb
+++ b/spec/features/projects/files/find_file_keyboard_spec.rb
--- a/spec/features/projects/guest_navigation_menu_spec.rb
+++ b/spec/features/projects/guest_navigation_menu_spec.rb
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
--- a/spec/features/projects/members/group_links_spec.rb
+++ b/spec/features/projects/members/group_links_spec.rb
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
--- a/spec/features/projects/members/master_manages_access_requests_spec.rb
+++ b/spec/features/projects/members/master_manages_access_requests_spec.rb
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
--- a/spec/fixtures/api/schemas/board.json
+++ b/spec/fixtures/api/schemas/board.json
--- a/spec/fixtures/api/schemas/boards.json
+++ b/spec/fixtures/api/schemas/boards.json
--- a/spec/fixtures/api/schemas/conflicts.json
+++ b/spec/fixtures/api/schemas/conflicts.json
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
--- a/spec/javascripts/boards/boards_store_spec.js.es6
+++ b/spec/javascripts/boards/boards_store_spec.js.es6
--- a/spec/javascripts/boards/issue_spec.js.es6
+++ b/spec/javascripts/boards/issue_spec.js.es6
--- a/spec/javascripts/boards/list_spec.js.es6
+++ b/spec/javascripts/boards/list_spec.js.es6
--- a/spec/javascripts/boards/mock_data.js.es6
+++ b/spec/javascripts/boards/mock_data.js.es6
--- a/spec/javascripts/fixtures/gl_field_errors.html.haml
+++ b/spec/javascripts/fixtures/gl_field_errors.html.haml
--- a/spec/javascripts/gl_field_errors_spec.js.es6
+++ b/spec/javascripts/gl_field_errors_spec.js.es6
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
--- a/spec/javascripts/merge_request_widget_spec.js
+++ b/spec/javascripts/merge_request_widget_spec.js
--- a/spec/javascripts/u2f/authenticate_spec.js
+++ b/spec/javascripts/u2f/authenticate_spec.js
--- a/spec/lib/banzai/filter/emoji_filter_spec.rb
+++ b/spec/lib/banzai/filter/emoji_filter_spec.rb
--- a/spec/lib/banzai/object_renderer_spec.rb
+++ b/spec/lib/banzai/object_renderer_spec.rb
--- a/spec/lib/banzai/pipeline/description_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/description_pipeline_spec.rb
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
--- a/spec/lib/gitlab/conflict/file_spec.rb
+++ b/spec/lib/gitlab/conflict/file_spec.rb
--- a/spec/lib/gitlab/data_builder/push_spec.rb
+++ b/spec/lib/gitlab/data_builder/push_spec.rb
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
--- a/spec/models/appearance_spec.rb
+++ b/spec/models/appearance_spec.rb
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
--- a/spec/models/concerns/cache_markdown_field_spec.rb
+++ b/spec/models/concerns/cache_markdown_field_spec.rb
--- a/spec/models/cycle_analytics/code_spec.rb
+++ b/spec/models/cycle_analytics/code_spec.rb
--- a/spec/models/cycle_analytics/issue_spec.rb
+++ b/spec/models/cycle_analytics/issue_spec.rb
--- a/spec/models/cycle_analytics/plan_spec.rb
+++ b/spec/models/cycle_analytics/plan_spec.rb
--- a/spec/models/cycle_analytics/review_spec.rb
+++ b/spec/models/cycle_analytics/review_spec.rb
--- a/spec/models/cycle_analytics/test_spec.rb
+++ b/spec/models/cycle_analytics/test_spec.rb
--- a/spec/models/deploy_key_spec.rb
+++ b/spec/models/deploy_key_spec.rb
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
--- a/spec/models/label_link_spec.rb
+++ b/spec/models/label_link_spec.rb
--- a/spec/models/merge_request_diff_spec.rb
+++ b/spec/models/merge_request_diff_spec.rb
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
--- a/spec/models/project_group_link_spec.rb
+++ b/spec/models/project_group_link_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
--- a/spec/finders/trending_projects_finder_spec.rb
+++ b/spec/finders/trending_projects_finder_spec.rb
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
--- a/spec/requests/api/license_templates_spec.rb
+++ b/spec/requests/api/license_templates_spec.rb
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
--- a/spec/requests/api/templates_spec.rb
+++ b/spec/requests/api/templates_spec.rb
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
--- a/spec/requests/api/version_spec.rb
+++ b/spec/requests/api/version_spec.rb
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
--- a/spec/services/boards/create_service_spec.rb
+++ b/spec/services/boards/create_service_spec.rb
--- a/spec/services/boards/issues/create_service_spec.rb
+++ b/spec/services/boards/issues/create_service_spec.rb
--- a/spec/services/boards/issues/list_service_spec.rb
+++ b/spec/services/boards/issues/list_service_spec.rb
--- a/spec/services/boards/issues/move_service_spec.rb
+++ b/spec/services/boards/issues/move_service_spec.rb
--- a/spec/services/boards/list_service_spec.rb
+++ b/spec/services/boards/list_service_spec.rb
--- a/spec/services/boards/lists/create_service_spec.rb
+++ b/spec/services/boards/lists/create_service_spec.rb
--- a/spec/services/boards/lists/destroy_service_spec.rb
+++ b/spec/services/boards/lists/destroy_service_spec.rb
--- a/spec/services/boards/lists/generate_service_spec.rb
+++ b/spec/services/boards/lists/generate_service_spec.rb
--- a/spec/services/boards/lists/list_service_spec.rb
+++ b/spec/services/boards/lists/list_service_spec.rb
--- a/spec/services/boards/lists/move_service_spec.rb
+++ b/spec/services/boards/lists/move_service_spec.rb
--- a/spec/services/compare_service_spec.rb
+++ b/spec/services/compare_service_spec.rb
--- a/spec/services/create_deployment_service_spec.rb
+++ b/spec/services/create_deployment_service_spec.rb
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
--- a/spec/services/merge_requests/assign_issues_service_spec.rb
+++ b/spec/services/merge_requests/assign_issues_service_spec.rb
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
--- a/spec/services/merge_requests/resolve_service_spec.rb
+++ b/spec/services/merge_requests/resolve_service_spec.rb
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/slash_commands/interpret_service_spec.rb
+++ b/spec/services/slash_commands/interpret_service_spec.rb
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
--- a/spec/tasks/gitlab/users_rake_spec.rb
+++ b/spec/tasks/gitlab/users_rake_spec.rb
--- a/spec/workers/build_coverage_worker_spec.rb
+++ b/spec/workers/build_coverage_worker_spec.rb
--- a/spec/workers/build_finished_worker_spec.rb
+++ b/spec/workers/build_finished_worker_spec.rb
--- a/spec/workers/build_hooks_worker_spec.rb
+++ b/spec/workers/build_hooks_worker_spec.rb
--- a/spec/workers/build_success_worker_spec.rb
+++ b/spec/workers/build_success_worker_spec.rb
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
--- a/spec/workers/pipeline_hooks_worker_spec.rb
+++ b/spec/workers/pipeline_hooks_worker_spec.rb
--- a/spec/workers/pipeline_metrics_worker_spec.rb
+++ b/spec/workers/pipeline_metrics_worker_spec.rb
--- a/spec/workers/process_pipeline_worker_spec.rb
+++ b/spec/workers/process_pipeline_worker_spec.rb
--- a/spec/workers/pipeline_success_worker_spec.rb
+++ b/spec/workers/pipeline_success_worker_spec.rb
--- a/spec/workers/update_pipeline_worker_spec.rb
+++ b/spec/workers/update_pipeline_worker_spec.rb
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
--- a/spec/workers/trending_projects_worker_spec.rb
+++ b/spec/workers/trending_projects_worker_spec.rb
--- a/spec/workers/update_merge_requests_worker_spec.rb
+++ b/spec/workers/update_merge_requests_worker_spec.rb