Merge branch 'ce-to-ee-2018-10-15' into 'master'

CE upstream - 2018-10-15 17:21 UTC

Closes gitlab-ce#39697

See merge request gitlab-org/gitlab-ee!7938

Gemfile

@@ -86,9 +86,6 @@ gem 'net-ldap'
 # Only used to compute wiki page slugs
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
 
-# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-
 # API
 gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
@@ -156,6 +153,7 @@ gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
+gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
 gem 'icalendar'

Gemfile.lock

@@ -301,11 +301,6 @@ GEM
     gitaly-proto (0.118.1)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
-    github-linguist (5.3.3)
-      charlock_holmes (~> 0.7.5)
-      escape_utils (~> 1.1.0)
-      mime-types (>= 1.19)
-      rugged (>= 0.25.1)
     github-markup (1.7.0)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
@@ -1033,6 +1028,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   faraday_middleware-aws-signers-v4
@@ -1056,7 +1052,6 @@ DEPENDENCIES
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
   gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
   github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)

Gemfile.rails5.lock

@@ -304,11 +304,6 @@ GEM
     gitaly-proto (0.118.1)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
-    github-linguist (5.3.3)
-      charlock_holmes (~> 0.7.5)
-      escape_utils (~> 1.1.0)
-      mime-types (>= 1.19)
-      rugged (>= 0.25.1)
     github-markup (1.7.0)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
@@ -1042,6 +1037,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   faraday_middleware-aws-signers-v4
@@ -1065,7 +1061,6 @@ DEPENDENCIES
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
   gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
   github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)

app/assets/javascripts/blob_edit/blob_bundle.js

@@ -13,11 +13,11 @@ export default () => {
   if (editBlobForm.length) {
     const urlRoot = editBlobForm.data('relativeUrlRoot');
     const assetsPath = editBlobForm.data('assetsPrefix');
-    const blobLanguage = editBlobForm.data('blobLanguage');
+    const filePath = editBlobForm.data('blobFilename')
     const currentAction = $('.js-file-title').data('currentAction');
     const projectId = editBlobForm.data('project-id');
 
-    new EditBlob(`${urlRoot}${assetsPath}`, blobLanguage, currentAction, projectId);
+    new EditBlob(`${urlRoot}${assetsPath}`, filePath, currentAction, projectId);
     new NewCommitForm(editBlobForm);
   }
 

app/assets/javascripts/blob_edit/edit_blob.js

@@ -5,6 +5,7 @@ import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
 import TemplateSelectorMediator from '../blob/file_template_mediator';
+import getModeByFileExtension from '~/lib/utils/ace_utils';
 
 export default class EditBlob {
   constructor(assetsPath, aceMode, currentAction, projectId) {
@@ -14,9 +15,10 @@ export default class EditBlob {
     this.initFileSelectors(currentAction, projectId);
   }
 
-  configureAceEditor(aceMode, assetsPath) {
+  configureAceEditor(filePath, assetsPath) {
     ace.config.set('modePath', `${assetsPath}/ace`);
     ace.config.loadModule('ace/ext/searchbox');
+    ace.config.loadModule('ace/ext/modelist');
 
     this.editor = ace.edit('editor');
 
@@ -25,8 +27,8 @@ export default class EditBlob {
 
     this.editor.focus();
 
-    if (aceMode) {
-      this.editor.getSession().setMode(`ace/mode/${aceMode}`);
+    if (filePath) {
+      this.editor.getSession().setMode(getModeByFileExtension(filePath));
     }
   }
 

app/assets/javascripts/lib/ace.js

 /*= require ace/ace */
+/*= require ace/ext-modelist */
 /*= require ace/ext-searchbox */
 /*= require ./ace/ace_config_paths */

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

+/* global ace */
+
+export default function getModeByFileExtension(path) {
+  const modelist = ace.require("ace/ext/modelist");
+  return modelist.getModeForPath(path).mode;
+};

app/assets/javascripts/main.js

@@ -205,7 +205,6 @@ document.addEventListener('DOMContentLoaded', () => {
 
   $('.navbar-toggler').on('click', () => {
     $('.header-content').toggleClass('menu-expanded');
-    gl.lazyLoader.loadCheck();
   });
 
   // Show/hide comments on diff

app/assets/javascripts/merge_conflicts/components/diff_file_editor.js

@@ -5,6 +5,7 @@ import Vue from 'vue';
 import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
 import { __ } from '~/locale';
+import getModeByFileExtension from '~/lib/utils/ace_utils';
 
 (global => {
   global.mergeConflicts = global.mergeConflicts || {};
@@ -72,7 +73,7 @@ import { __ } from '~/locale';
             this.fileLoaded = true;
             this.editor = ace.edit(content);
             this.editor.$blockScrolling = Infinity; // Turn off annoying warning
-            this.editor.getSession().setMode(`ace/mode/${data.blob_ace_mode}`);
+            this.editor.getSession().setMode(getModeByFileExtension(data.new_path));
             this.editor.on('change', () => {
               this.saveDiffResolution();
             });

app/assets/javascripts/right_sidebar.js

@@ -57,8 +57,6 @@ Sidebar.prototype.sidebarToggleClicked = function (e, triggered) {
     $allGutterToggleIcons.removeClass('fa-angle-double-left').addClass('fa-angle-double-right');
     $('aside.right-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
     $('.layout-page').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
-
-    if (gl.lazyLoader) gl.lazyLoader.loadCheck();
   }
 
   $this.attr('data-original-title', tooltipLabel);

app/controllers/projects/clusters/applications_controller.rb

@@ -2,31 +2,20 @@
 
 class Projects::Clusters::ApplicationsController < Projects::ApplicationController
   before_action :cluster
-  before_action :application_class, only: [:create]
   before_action :authorize_read_cluster!
   before_action :authorize_create_cluster!, only: [:create]
 
-  # rubocop: disable CodeReuse/ActiveRecord
   def create
-    application = @application_class.find_or_initialize_by(cluster: @cluster)
-
-    if application.has_attribute?(:hostname)
-      application.hostname = params[:hostname]
-    end
-
-    if application.respond_to?(:oauth_application)
-      application.oauth_application = create_oauth_application(application)
-    end
-
-    application.save!
-
-    Clusters::Applications::ScheduleInstallationService.new(project, current_user).execute(application)
+    Clusters::Applications::CreateService
+      .new(@cluster, current_user, create_cluster_application_params)
+      .execute(request)
 
     head :no_content
+  rescue Clusters::Applications::CreateService::InvalidApplicationError
+    render_404
   rescue StandardError
     head :bad_request
   end
-  # rubocop: enable CodeReuse/ActiveRecord
 
   private
 
@@ -34,18 +23,7 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
     @cluster ||= project.clusters.find(params[:id]) || render_404
   end
 
-  def application_class
-    @application_class ||= Clusters::Cluster::APPLICATIONS[params[:application]] || render_404
-  end
-
-  def create_oauth_application(application)
-    oauth_application_params = {
-      name: params[:application],
-      redirect_uri: application.callback_url,
-      scopes: 'api read_user openid',
-      owner: current_user
-    }
-
-    Applications::CreateService.new(current_user, oauth_application_params).execute(request)
+  def create_cluster_application_params
+    params.permit(:application, :hostname)
   end
 end

app/helpers/blob_helper.rb

@@ -195,7 +195,7 @@ module BlobHelper
     {
       'relative-url-root' => Rails.application.config.relative_url_root,
       'assets-prefix' => Gitlab::Application.config.assets.prefix,
-      'blob-language' => @blob && @blob.language.try(:ace_mode),
+      'blob-filename' => @blob && @blob.path,
       'project-id' => project.id
     }
   end

app/models/blob.rb

@@ -164,7 +164,7 @@ class Blob < SimpleDelegator
     if stored_externally?
       if rich_viewer
         rich_viewer.binary?
-      elsif Linguist::Language.find_by_extension(name).any?
+      elsif known_extension?
         false
       elsif _mime_type
         _mime_type.binary?

app/models/concerns/blob_like.rb

@@ -2,7 +2,7 @@
 
 module BlobLike
   extend ActiveSupport::Concern
-  include Linguist::BlobHelper
+  include Gitlab::BlobHelper
 
   def id
     raise NotImplementedError

app/models/repository.rb

@@ -880,10 +880,12 @@ class Repository
 
   delegate :merged_branch_names, to: :raw_repository
 
-  def merge_base(first_commit_id, second_commit_id)
-    first_commit_id = commit(first_commit_id).try(:id) || first_commit_id
-    second_commit_id = commit(second_commit_id).try(:id) || second_commit_id
-    raw_repository.merge_base(first_commit_id, second_commit_id)
+  def merge_base(*commits_or_ids)
+    commit_ids = commits_or_ids.map do |commit_or_id|
+      commit_or_id.is_a?(::Commit) ? commit_or_id.id : commit_or_id
+    end
+
+    raw_repository.merge_base(*commit_ids)
   end
 
   def ancestor?(ancestor_id, descendant_id)

app/serializers/issue_entity.rb

@@ -43,6 +43,6 @@ class IssueEntity < IssuableEntity
   end
 
   expose :preview_note_path do |issue|
-    preview_markdown_path(issue.project, quick_actions_target_type: 'Issue', quick_actions_target_id: issue.id)
+    preview_markdown_path(issue.project, quick_actions_target_type: 'Issue', quick_actions_target_id: issue.iid)
   end
 end

app/serializers/merge_request_widget_entity.rb

@@ -224,7 +224,7 @@ class MergeRequestWidgetEntity < IssuableEntity
   end
 
   expose :preview_note_path do |merge_request|
-    preview_markdown_path(merge_request.project, quick_actions_target_type: 'MergeRequest', quick_actions_target_id: merge_request.id)
+    preview_markdown_path(merge_request.project, quick_actions_target_type: 'MergeRequest', quick_actions_target_id: merge_request.iid)
   end
 
   expose :merge_commit_path do |merge_request|

app/services/applications/create_service.rb

@@ -11,6 +11,7 @@ module Applications
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
+    # EE would override and use `request` arg
     def execute(request)
       Doorkeeper::Application.create(@params)
     end

app/services/clusters/applications/create_service.rb

+# frozen_string_literal: true
+
+module Clusters
+  module Applications
+    class CreateService
+      InvalidApplicationError = Class.new(StandardError)
+
+      attr_reader :cluster, :current_user, :params
+
+      def initialize(cluster, user, params = {})
+        @cluster = cluster
+        @current_user = user
+        @params = params.dup
+      end
+
+      def execute(request)
+        create_application.tap do |application|
+          if application.has_attribute?(:hostname)
+            application.hostname = params[:hostname]
+          end
+
+          if application.respond_to?(:oauth_application)
+            application.oauth_application = create_oauth_application(application, request)
+          end
+
+          application.save!
+
+          Clusters::Applications::ScheduleInstallationService.new(application).execute
+        end
+      end
+
+      private
+
+      def create_application
+        builder.call(@cluster)
+      end
+
+      def builder
+        builders[application_name] || raise(InvalidApplicationError, "invalid application: #{application_name}")
+      end
+
+      def builders
+        {
+          "helm" => -> (cluster) { cluster.application_helm || cluster.build_application_helm },
+          "ingress" => -> (cluster) { cluster.application_ingress || cluster.build_application_ingress },
+          "prometheus" => -> (cluster) { cluster.application_prometheus || cluster.build_application_prometheus },
+          "runner" => -> (cluster) { cluster.application_runner || cluster.build_application_runner },
+          "jupyter" => -> (cluster) { cluster.application_jupyter || cluster.build_application_jupyter }
+        }
+      end
+
+      def application_name
+        params[:application]
+      end
+
+      def create_oauth_application(application, request)
+        oauth_application_params = {
+          name: params[:application],
+          redirect_uri: application.callback_url,
+          scopes: 'api read_user openid',
+          owner: current_user
+        }
+
+        ::Applications::CreateService.new(current_user, oauth_application_params).execute(request)
+      end
+    end
+  end
+end

app/services/clusters/applications/schedule_installation_service.rb

@@ -2,8 +2,14 @@
 
 module Clusters
   module Applications
-    class ScheduleInstallationService < ::BaseService
-      def execute(application)
+    class ScheduleInstallationService
+      attr_reader :application
+
+      def initialize(application)
+        @application = application
+      end
+
+      def execute
         application.make_scheduled!
 
         ClusterInstallAppWorker.perform_async(application.name, application.id)

bin/elastic_repo_indexer

@@ -7,13 +7,15 @@ require 'active_model'
 require 'active_support'
 require 'active_support/core_ext'
 require 'benchmark'
+require 'charlock_holmes'
 
+$: << File.expand_path('../lib', __dir__)
 $: << File.expand_path('../ee/lib', __dir__)
 
-require 'linguist'
 require 'open3'
 require 'rugged'
 
+require 'gitlab/blob_helper'
 require 'gitlab/elastic/client'
 require 'elasticsearch/model'
 require 'elasticsearch/git'

changelogs/unreleased/52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state.yml

+---
+title: Allow Issue and Merge Request sidebar to be toggled from collapsed state
+merge_request: 22353
+author:
+type: fixed

changelogs/unreleased/52669-fixes-quick-actions-preview.yml

+---
+title: Fixes close/reopen quick actions preview for issues and merge_requests
+merge_request: 22343
+author: Jacopo Beschi @jacopo-beschi
+type: fixed

changelogs/unreleased/bvl-merge-base-multiple-revisions.yml

+---
+title: Allow finding the common ancestor for multiple revisions through the API
+merge_request: 22295
+author:
+type: changed

changelogs/unreleased/sh-remove-koding.yml

+---
+title: Remove Koding integration and documentation
+merge_request: 22334
+author:
+type: removed

changelogs/unreleased/zj-remove-linguist.yml

+---
+title: Remove Linguist gem, reducing Rails memory usage by 128MB per process
+merge_request: 21008
+author:
+type: changed

doc/api/repositories.md

@@ -216,7 +216,7 @@ GET /projects/:id/repository/merge_base
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
-| `refs` | array | yes | The refs to find the common ancestor of, for now only 2 refs are supported |
+| `refs` | array | yes | The refs to find the common ancestor of, multiple refs can be passed |
 
 ```bash
 curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/5/repository/merge_base?refs[]=304d257dcb821665ab5110318fc58a007bd104ed&refs[]=0031876facac3f2b2702a0e53a26e89939a42209"

doc/development/code_review.md

@@ -29,7 +29,7 @@ There are a few rules to get your merge request accepted:
       to ask one of the [Merge request coaches][team].
    1. It is recommended that you assign a maintainer that is from a different team than your own.
       This ensures that all code across GitLab is consistent and can be easily understood by all contributors.
-      
+
 1. Keep in mind that maintainers are also going to perform a final code review.
    The ideal scenario is that the reviewer has already addressed any concerns
    the maintainer would have found, and the maintainer only has to perform the
@@ -97,6 +97,20 @@ first time.
   branch. Do not squash until the branch is ready to merge. Reviewers should be
   able to read individual updates based on their earlier feedback.
 
+### Assigning a merge request for a review
+
+If you want to have your merge request reviewed you can assign it to any reviewer. The list of reviewers can be found on [Engineering projects](https://about.gitlab.com/handbook/engineering/projects/) page.
+
+You can also use `ready for review` label. That means that your merge request is ready to be reviewed and any reviewer can pick it. It is recommended to use that label only if there isn't time pressure and make sure the merge request is assigned to a reviewer.
+
+When your merge request was reviewed and can be passed to a maintainer you can either pick a specific maintainer or use a label `ready for merge`.
+
+It is responsibility of the author of a merge request that the merge request is reviewed. If it stays in `ready for review` state too long it is recommended to assign it to a specific reviewer.
+
+### List of merge requests ready for review
+
+Developers who have capacity can regularly check the list of [merge requests to review](https://gitlab.com/groups/gitlab-org/-/merge_requests?scope=all&utf8=%E2%9C%93&state=opened&label_name%5B%5D=ready%20for%20review&assignee_id=0) and assign any merge request they want to review.
+
 ### Reviewing code
 
 Understand why the change is necessary (fixes a bug, improves the user

ee/lib/elasticsearch/git/lite_blob.rb

 module Elasticsearch
   module Git
     class LiteBlob
-      include Linguist::BlobHelper
+      include ::Gitlab::BlobHelper
       include Elasticsearch::Git::EncoderHelper
 
       attr_accessor :id, :name, :path, :size, :mode, :commit_id

ee/lib/elasticsearch/git/repository.rb

@@ -151,7 +151,9 @@ module Elasticsearch
                   # https://github.com/elastic/elasticsearch-mapper-attachments/issues/124
                   file_name: blob.path,
 
-                  language: blob.language ? blob.language.name : "Text"
+                  # Linguist is not available in the Ruby indexer. The Go indexer can
+                  # fill in the right language.
+                  language: nil
                 }
               }
             }

lib/api/repositories.rb

@@ -130,18 +130,13 @@ module API
         success Entities::Commit
       end
       params do
-        # For now we just support 2 refs passed, but `merge-base` supports
-        # multiple defining this as an Array instead of 2 separate params will
-        # make sure we don't need to deprecate this API in favor of one
-        # supporting multiple commits when this functionality gets added to
-        # Gitaly
         requires :refs, type: Array[String]
       end
       get ':id/repository/merge_base' do
         refs = params[:refs]
 
-        unless refs.size == 2
-          render_api_error!('Provide exactly 2 refs', 400)
+        if refs.size < 2
+          render_api_error!('Provide at least 2 refs', 400)
         end
 
         merge_base = Gitlab::Git::MergeBase.new(user_project.repository, refs)

lib/gitlab/blob_helper.rb

+# This has been extracted from https://github.com/github/linguist/blob/master/lib/linguist/blob_helper.rb
+module Gitlab
+  module BlobHelper
+    def extname
+      File.extname(name.to_s)
+    end
+
+    def known_extension?
+      LanguageData.extensions.include?(extname)
+    end
+
+    def viewable?
+      !large? && text?
+    end
+
+    MEGABYTE = 1024 * 1024
+
+    def large?
+      size.to_i > MEGABYTE
+    end
+
+    def binary?
+      # Large blobs aren't even loaded into memory
+      if data.nil?
+        true
+
+      # Treat blank files as text
+      elsif data == ""
+        false
+
+      # Charlock doesn't know what to think
+      elsif encoding.nil?
+        true
+
+      # If Charlock says its binary
+      else
+        detect_encoding[:type] == :binary
+      end
+    end
+
+    def text?
+      !binary?
+    end
+
+    def image?
+      ['.png', '.jpg', '.jpeg', '.gif'].include?(extname.downcase)
+    end
+
+    # Internal: Lookup mime type for extension.
+    #
+    # Returns a MIME::Type
+    # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    def _mime_type
+      if defined? @_mime_type
+        @_mime_type
+      else
+        guesses = ::MIME::Types.type_for(extname.to_s)
+
+        # Prefer text mime types over binary
+        @_mime_type = guesses.detect { |type| type.ascii? } || guesses.first
+      end
+    end
+    # rubocop:enable Gitlab/ModuleWithInstanceVariables
+
+    # Public: Get the actual blob mime type
+    #
+    # Examples
+    #
+    #   # => 'text/plain'
+    #   # => 'text/html'
+    #
+    # Returns a mime type String.
+    def mime_type
+      _mime_type ? _mime_type.to_s : 'text/plain'
+    end
+
+    def binary_mime_type?
+      _mime_type ? _mime_type.binary? : false
+    end
+
+    def lines
+      @lines ||=
+        if viewable? && data
+          # `data` is usually encoded as ASCII-8BIT even when the content has
+          # been detected as a different encoding. However, we are not allowed
+          # to change the encoding of `data` because we've made the implicit
+          # guarantee that each entry in `lines` is encoded the same way as
+          # `data`.
+          #
+          # Instead, we re-encode each possible newline sequence as the
+          # detected encoding, then force them back to the encoding of `data`
+          # (usually a binary encoding like ASCII-8BIT). This means that the
+          # byte sequence will match how newlines are likely encoded in the
+          # file, but we don't have to change the encoding of `data` as far as
+          # Ruby is concerned. This allows us to correctly parse out each line
+          # without changing the encoding of `data`, and
+          # also--importantly--without having to duplicate many (potentially
+          # large) strings.
+          begin
+            data.split(encoded_newlines_re, -1)
+          rescue Encoding::ConverterNotFoundError
+            # The data is not splittable in the detected encoding.  Assume it's
+            # one big line.
+            [data]
+          end
+        else
+          []
+        end
+    end
+
+    def content_type
+      # rubocop:disable Style/MultilineTernaryOperator
+      # rubocop:disable Style/NestedTernaryOperator
+      @content_type ||= binary_mime_type? || binary? ? mime_type :
+                          (encoding ? "text/plain; charset=#{encoding.downcase}" : "text/plain")
+      # rubocop:enable Style/NestedTernaryOperator
+      # rubocop:enable Style/MultilineTernaryOperator
+    end
+
+    def encoded_newlines_re
+      @encoded_newlines_re ||=
+        Regexp.union(["\r\n", "\r", "\n"].map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) })
+    end
+
+    def ruby_encoding
+      if hash = detect_encoding
+        hash[:ruby_encoding]
+      end
+    end
+
+    def encoding
+      if hash = detect_encoding
+        hash[:encoding]
+      end
+    end
+
+    def detect_encoding
+      @detect_encoding ||= CharlockHolmes::EncodingDetector.new.detect(data) if data # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    end
+
+    def empty?
+      data.nil? || data == ""
+    end
+  end
+end

lib/gitlab/conflict/file.rb

@@ -158,7 +158,6 @@ module Gitlab
         json_hash.tap do |json_hash|
           if opts[:full_content]
             json_hash[:content] = content
-            json_hash[:blob_ace_mode] = our_blob && our_blob.language.try(:ace_mode)
           else
             json_hash[:sections] = sections if type.text?
             json_hash[:type] = type

lib/gitlab/git/blob.rb

@@ -3,13 +3,13 @@
 module Gitlab
   module Git
     class Blob
-      include Linguist::BlobHelper
+      include Gitlab::BlobHelper
       include Gitlab::EncodingHelper
 
       # This number is the maximum amount of data that we want to display to
-      # the user. We load as much as we can for encoding detection
-      # (Linguist) and LFS pointer parsing. All other cases where we need full
-      # blob data should use load_all_data!.
+      # the user. We load as much as we can for encoding detection and LFS
+      # pointer parsing. All other cases where we need full blob data should
+      # use load_all_data!.
       MAX_DATA_DISPLAY_SIZE = 10.megabytes
 
       # These limits are used as a heuristic to ignore files which can't be LFS

lib/gitlab/git/blob_snippet.rb

-# Gitaly note: JV: no RPC's here.
-
-module Gitlab
-  module Git
-    class BlobSnippet
-      include Linguist::BlobHelper
-
-      attr_accessor :ref
-      attr_accessor :lines
-      attr_accessor :filename
-      attr_accessor :startline
-
-      def initialize(ref, lines, startline, filename)
-        @ref, @lines, @startline, @filename = ref, lines, startline, filename
-      end
-
-      def data
-        lines&.join("\n")
-      end
-
-      def name
-        filename
-      end
-
-      def size
-        data.length
-      end
-
-      def mode
-        nil
-      end
-    end
-  end
-end

lib/gitlab/git/repository.rb

@@ -382,9 +382,9 @@ module Gitlab
       end
 
       # Returns the SHA of the most recent common ancestor of +from+ and +to+
-      def merge_base(from, to)
+      def merge_base(*commits)
         wrapped_gitaly_errors do
-          gitaly_repository_client.find_merge_base(from, to)
+          gitaly_repository_client.find_merge_base(*commits)
         end
       end
 

lib/gitlab/language_data.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module LanguageData
+    EXTENSION_MUTEX = Mutex.new
+
+    class << self
+      include Gitlab::Utils::StrongMemoize
+
+      def extensions
+        EXTENSION_MUTEX.synchronize do
+          strong_memoize(:extensions) do
+            Set.new.tap do |set|
+              YAML.load_file(Rails.root.join('vendor', 'languages.yml')).each do |_name, details|
+                details['extensions']&.each do |ext|
+                  next unless ext.start_with?('.')
+
+                  set << ext.downcase
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def clear_extensions!
+        EXTENSION_MUTEX.synchronize do
+          clear_memoization(:extensions)
+        end
+      end
+    end
+  end
+end

spec/controllers/projects/merge_requests/conflicts_controller_spec.rb

@@ -150,7 +150,6 @@ describe Projects::MergeRequests::ConflictsController do
                                          'new_path' => path,
                                          'blob_icon' => 'file-text-o',
                                          'blob_path' => a_string_ending_with(path),
-                                         'blob_ace_mode' => 'ruby',
                                          'content' => content)
       end
     end

spec/javascripts/right_sidebar_spec.js

-/* eslint-disable no-var, one-var, no-return-assign, vars-on-top, jasmine/no-unsafe-spy */
+/* eslint-disable no-var, one-var, no-return-assign, vars-on-top */
 
 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
@@ -94,33 +94,5 @@ import Sidebar from '~/right_sidebar';
         });
       });
     });
-
-    describe('sidebarToggleClicked', () => {
-      const event = jasmine.createSpyObj('event', ['preventDefault']);
-
-      beforeEach(() => {
-        spyOn($.fn, 'hasClass').and.returnValue(false);
-      });
-
-      afterEach(() => {
-        gl.lazyLoader = undefined;
-      });
-
-      it('calls loadCheck if lazyLoader is set', () => {
-        gl.lazyLoader = jasmine.createSpyObj('lazyLoader', ['loadCheck']);
-
-        Sidebar.prototype.sidebarToggleClicked(event);
-
-        expect(gl.lazyLoader.loadCheck).toHaveBeenCalled();
-      });
-
-      it('does not throw if lazyLoader is not defined', () => {
-        gl.lazyLoader = undefined;
-
-        const toggle = Sidebar.prototype.sidebarToggleClicked.bind(null, event);
-
-        expect(toggle).not.toThrow();
-      });
-    });
   });
 }).call(window);

spec/lib/gitlab/blob_helper_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::BlobHelper do
+  include FakeBlobHelpers
+
+  let(:project) { create(:project) }
+  let(:blob) { fake_blob(path: 'file.txt') }
+  let(:large_blob) { fake_blob(path: 'test.pdf', size: 2.megabytes, binary: true) }
+
+  describe '#extname' do
+    it 'returns the extension' do
+      expect(blob.extname).to eq('.txt')
+    end
+  end
+
+  describe '#known_extension?' do
+    it 'returns true' do
+      expect(blob.known_extension?).to be_truthy
+    end
+  end
+
+  describe '#viewable' do
+    it 'returns true' do
+      expect(blob.viewable?).to be_truthy
+    end
+
+    it 'returns false' do
+      expect(large_blob.viewable?).to be_falsey
+    end
+  end
+
+  describe '#large?' do
+    it 'returns false' do
+      expect(blob.large?).to be_falsey
+    end
+
+    it 'returns true' do
+      expect(large_blob.large?).to be_truthy
+    end
+  end
+
+  describe '#binary?' do
+    it 'returns true' do
+      expect(large_blob.binary?).to be_truthy
+    end
+
+    it 'returns false' do
+      expect(blob.binary?).to be_falsey
+    end
+  end
+
+  describe '#text?' do
+    it 'returns true' do
+      expect(blob.text?).to be_truthy
+    end
+
+    it 'returns false' do
+      expect(large_blob.text?).to be_falsey
+    end
+  end
+
+  describe '#image?' do
+    it 'returns false' do
+      expect(blob.image?).to be_falsey
+    end
+  end
+
+  describe '#mime_type' do
+    it 'returns text/plain' do
+      expect(blob.mime_type).to eq('text/plain')
+    end
+
+    it 'returns application/pdf' do
+      expect(large_blob.mime_type).to eq('application/pdf')
+    end
+  end
+
+  describe '#binary_mime_type?' do
+    it 'returns false' do
+      expect(blob.binary_mime_type?).to be_falsey
+    end
+  end
+
+  describe '#lines' do
+    it 'returns the payload in an Array' do
+      expect(blob.lines).to eq(['foo'])
+    end
+  end
+
+  describe '#content_type' do
+    it 'returns text/plain' do
+      expect(blob.content_type).to eq('text/plain; charset=utf-8')
+    end
+
+    it 'returns text/plain' do
+      expect(large_blob.content_type).to eq('application/pdf')
+    end
+  end
+
+  describe '#encoded_newlines_re' do
+    it 'returns a regular expression' do
+      expect(blob.encoded_newlines_re).to eq(/\r\n|\r|\n/)
+    end
+  end
+
+  describe '#ruby_encoding' do
+    it 'returns UTF-8' do
+      expect(blob.ruby_encoding).to eq('UTF-8')
+    end
+  end
+
+  describe '#encoding' do
+    it 'returns UTF-8' do
+      expect(blob.ruby_encoding).to eq('UTF-8')
+    end
+  end
+
+  describe '#empty?' do
+    it 'returns false' do
+      expect(blob.empty?).to be_falsey
+    end
+  end
+end

spec/lib/gitlab/conflict/file_spec.rb

@@ -267,11 +267,6 @@ FILE
       it 'includes the full content of the conflict' do
         expect(conflict_file.as_json(full_content: true)).to have_key(:content)
       end
-
-      it 'includes the detected language of the conflict file' do
-        expect(conflict_file.as_json(full_content: true)[:blob_ace_mode])
-          .to eq('ruby')
-      end
     end
   end
 end

spec/lib/gitlab/git/blob_snippet_spec.rb

-# encoding: UTF-8
-
-require "spec_helper"
-
-describe Gitlab::Git::BlobSnippet, :seed_helper do
-  describe '#data' do
-    context 'empty lines' do
-      let(:snippet) { Gitlab::Git::BlobSnippet.new('master', nil, nil, nil) }
-
-      it { expect(snippet.data).to be_nil }
-    end
-
-    context 'present lines' do
-      let(:snippet) { Gitlab::Git::BlobSnippet.new('master', %w(wow much), 1, 'wow.rb') }
-
-      it { expect(snippet.data).to eq("wow\nmuch") }
-    end
-  end
-end

spec/lib/gitlab/language_data_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::LanguageData do
+  describe '#extensions' do
+    before do
+      described_class.clear_extensions!
+    end
+
+    it 'loads the extensions once' do
+      expect(YAML).to receive(:load_file).once.and_call_original
+
+      2.times do
+        expect(described_class.extensions).to be_a(Set)
+        expect(described_class.extensions.count).to be > 0
+        # Sanity check for known extensions
+        expect(described_class.extensions).to include(*%w(.rb .yml .json))
+      end
+    end
+  end
+end

spec/models/repository_spec.rb

@@ -2372,4 +2372,15 @@ describe Repository do
       end
     end
   end
+
+  describe '#merge_base' do
+    set(:project) { create(:project, :repository) }
+    subject(:repository) { project.repository }
+
+    it 'only makes one gitaly call' do
+      expect(Gitlab::GitalyClient).to receive(:call).once.and_call_original
+
+      repository.merge_base('master', 'fix')
+    end
+  end
 end

spec/requests/api/repositories_spec.rb

@@ -468,7 +468,7 @@ describe API::Repositories do
 
   describe 'GET :id/repository/merge_base' do
     let(:refs) do
-      %w(304d257dcb821665ab5110318fc58a007bd104ed 0031876facac3f2b2702a0e53a26e89939a42209)
+      %w(304d257dcb821665ab5110318fc58a007bd104ed 0031876facac3f2b2702a0e53a26e89939a42209 570e7b2abdd848b95f2f578043fc23bd6f6fd24d)
     end
 
     subject(:request) do
@@ -534,7 +534,7 @@ describe API::Repositories do
         request
 
         expect(response).to have_gitlab_http_status(:bad_request)
-        expect(json_response['message']).to eq('Provide exactly 2 refs')
+        expect(json_response['message']).to eq('Provide at least 2 refs')
       end
     end
   end

spec/services/applications/create_service_spec.rb

+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ::Applications::CreateService do
+  include TestRequestHelpers
+
   let(:user) { create(:user) }
   let(:params) { attributes_for(:application) }
-  let(:request) do
-    if Gitlab.rails5?
-      ActionController::TestRequest.new({ remote_ip: "127.0.0.1" }, ActionController::TestSession.new)
-    else
-      ActionController::TestRequest.new(remote_ip: "127.0.0.1")
-    end
-  end
 
   subject { described_class.new(user, params) }
 
-  it { expect { subject.execute(request) }.to change { Doorkeeper::Application.count }.by(1) }
+  it { expect { subject.execute(test_request) }.to change { Doorkeeper::Application.count }.by(1) }
 end

spec/services/clusters/applications/create_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::Applications::CreateService do
+  include TestRequestHelpers
+
+  let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+  let(:user) { create(:user) }
+  let(:params) { { application: 'helm' } }
+  let(:service) { described_class.new(cluster, user, params) }
+
+  describe '#execute' do
+    before do
+      allow(ClusterInstallAppWorker).to receive(:perform_async)
+    end
+
+    subject { service.execute(test_request) }
+
+    it 'creates an application' do
+      expect do
+        subject
+
+        cluster.reload
+      end.to change(cluster, :application_helm)
+    end
+
+    it 'schedules an install via worker' do
+      expect(ClusterInstallAppWorker).to receive(:perform_async).with('helm', anything).once
+
+      subject
+    end
+
+    context 'jupyter application' do
+      let(:params) do
+        {
+          application: 'jupyter',
+          hostname: 'example.com'
+        }
+      end
+
+      before do
+        allow_any_instance_of(Clusters::Applications::ScheduleInstallationService).to receive(:execute)
+      end
+
+      it 'creates the application' do
+        expect do
+          subject
+
+          cluster.reload
+        end.to change(cluster, :application_jupyter)
+      end
+
+      it 'sets the hostname' do
+        expect(subject.hostname).to eq('example.com')
+      end
+
+      it 'sets the oauth_application' do
+        expect(subject.oauth_application).to be_present
+      end
+    end
+
+    context 'invalid application' do
+      let(:params) { { application: 'non-existent' } }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(Clusters::Applications::CreateService::InvalidApplicationError)
+      end
+    end
+  end
+end

spec/services/clusters/applications/schedule_installation_service_spec.rb

@@ -10,14 +10,13 @@ describe Clusters::Applications::ScheduleInstallationService do
       expect(ClusterInstallAppWorker).not_to receive(:perform_async)
       count_before = count_scheduled
 
-      expect { service.execute(application) }.to raise_error(StandardError)
+      expect { service.execute }.to raise_error(StandardError)
       expect(count_scheduled).to eq(count_before)
     end
   end
 
   describe '#execute' do
-    let(:project) { double(:project) }
-    let(:service) { described_class.new(project, nil) }
+    let(:service) { described_class.new(application) }
 
     context 'when application is installable' do
       let(:application) { create(:clusters_applications_helm, :installable) }
@@ -25,7 +24,7 @@ describe Clusters::Applications::ScheduleInstallationService do
       it 'make the application scheduled' do
         expect(ClusterInstallAppWorker).to receive(:perform_async).with(application.name, kind_of(Numeric)).once
 
-        expect { service.execute(application) }.to change { application.class.with_status(:scheduled).count }.by(1)
+        expect { service.execute }.to change { application.class.with_status(:scheduled).count }.by(1)
       end
     end
 

spec/support/features/issuable_quick_actions_shared_examples.rb

@@ -77,6 +77,15 @@ shared_examples 'issuable record that supports quick actions in its description
         expect(issuable.labels).to eq [label_bug]
         expect(issuable.milestone).to eq milestone
       end
+
+      it 'removes the quick action from note and explains it in the preview' do
+        preview_note("Awesome!\n\n/close")
+
+        expect(page).to have_content 'Awesome!'
+        expect(page).not_to have_content '/close'
+        issuable_name = issuable.is_a?(Issue) ? 'issue' : 'merge request'
+        expect(page).to have_content "Closes this #{issuable_name}."
+      end
     end
 
     context 'with a note containing only commands' do

spec/support/helpers/test_request_helpers.rb

+# frozen_string_literal: true
+
+module TestRequestHelpers
+  def test_request(remote_ip: '127.0.0.1')
+    if Gitlab.rails5?
+      ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new)
+    else
+      ActionController::TestRequest.new(remote_ip: remote_ip)
+    end
+  end
+end