Add latest changes from gitlab-org/gitlab@master

Gemfile

@@ -171,7 +171,7 @@ group :unicorn do
 end
 group :puma do
-  gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false
+  gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
   gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
   gem 'rack-timeout', require: false
 end

Gemfile.lock

@@ -391,7 +391,7 @@ GEM
     gitlab-mail_room (0.0.3)
     gitlab-markup (1.7.0)
     gitlab-net-dns (0.9.1)
-    gitlab-puma (4.3.1.gitlab.2)
+    gitlab-puma (4.3.3.gitlab.2)
       nio4r (~> 2.0)
     gitlab-puma_worker_killer (0.1.1.gitlab.1)
       get_process_mem (~> 0.2)
@@ -1237,7 +1237,7 @@ DEPENDENCIES
   gitlab-mail_room (~> 0.0.3)
   gitlab-markup (~> 1.7.0)
   gitlab-net-dns (~> 0.9.1)
-  gitlab-puma (~> 4.3.1.gitlab.2)
+  gitlab-puma (~> 4.3.3.gitlab.2)
   gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
   gitlab-sidekiq-fetcher (= 0.5.2)
   gitlab-styles (~> 3.1.0)

app/assets/javascripts/blob/notebook/index.js

-/* eslint-disable no-new */
 import Vue from 'vue';
-import axios from '../../lib/utils/axios_utils';
-import notebookLab from '../../notebook/index.vue';
+import NotebookViewer from './notebook_viewer.vue';
 export default () => {
   const el = document.getElementById('js-notebook-viewer');
-  new Vue({
+  return new Vue({
     el,
-    components: {
-      notebookLab,
+    render(createElement) {
+      return createElement(NotebookViewer, {
+        props: {
+          endpoint: el.dataset.endpoint,
+        },
+      });
     },
-    data() {
-      return {
-        error: false,
-        loadError: false,
-        loading: true,
-        json: {},
-      };
-    },
-    mounted() {
-      if (gon.katex_css_url) {
-        const katexStyles = document.createElement('link');
-        katexStyles.setAttribute('rel', 'stylesheet');
-        katexStyles.setAttribute('href', gon.katex_css_url);
-        document.head.appendChild(katexStyles);
-      }
-
-      if (gon.katex_js_url) {
-        const katexScript = document.createElement('script');
-        katexScript.addEventListener('load', () => {
-          this.loadFile();
-        });
-        katexScript.setAttribute('src', gon.katex_js_url);
-        document.head.appendChild(katexScript);
-      } else {
-        this.loadFile();
-      }
-    },
-    methods: {
-      loadFile() {
-        axios
-          .get(el.dataset.endpoint)
-          .then(res => res.data)
-          .then(data => {
-            this.json = data;
-            this.loading = false;
-          })
-          .catch(e => {
-            if (e.status !== 200) {
-              this.loadError = true;
-            }
-
-            this.error = true;
-          });
-      },
-    },
-    template: `
-      <div class="container-fluid md prepend-top-default append-bottom-default">
-        <div
-          class="text-center loading"
-          v-if="loading && !error">
-          <i
-            class="fa fa-spinner fa-spin"
-            aria-hidden="true"
-            aria-label="iPython notebook loading">
-          </i>
-        </div>
-        <notebook-lab
-          v-if="!loading && !error"
-          :notebook="json"
-          code-css-class="code white" />
-        <p
-          class="text-center"
-          v-if="error">
-          <span v-if="loadError">
-            An error occurred while loading the file. Please try again later.
-          </span>
-          <span v-else>
-            An error occurred while parsing the file.
-          </span>
-        </p>
-      </div>
-    `,
   });
 };

app/assets/javascripts/blob/notebook/notebook_viewer.vue

+<script>
+import axios from '~/lib/utils/axios_utils';
+import notebookLab from '~/notebook/index.vue';
+import { GlLoadingIcon } from '@gitlab/ui';
+
+export default {
+  components: {
+    notebookLab,
+    GlLoadingIcon,
+  },
+  props: {
+    endpoint: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      error: false,
+      loadError: false,
+      loading: true,
+      json: {},
+    };
+  },
+  mounted() {
+    if (gon.katex_css_url) {
+      const katexStyles = document.createElement('link');
+      katexStyles.setAttribute('rel', 'stylesheet');
+      katexStyles.setAttribute('href', gon.katex_css_url);
+      document.head.appendChild(katexStyles);
+    }
+
+    if (gon.katex_js_url) {
+      const katexScript = document.createElement('script');
+      katexScript.addEventListener('load', () => {
+        this.loadFile();
+      });
+      katexScript.setAttribute('src', gon.katex_js_url);
+      document.head.appendChild(katexScript);
+    } else {
+      this.loadFile();
+    }
+  },
+  methods: {
+    loadFile() {
+      axios
+        .get(this.endpoint)
+        .then(res => res.data)
+        .then(data => {
+          this.json = data;
+          this.loading = false;
+        })
+        .catch(e => {
+          if (e.status !== 200) {
+            this.loadError = true;
+          }
+          this.error = true;
+        });
+    },
+  },
+};
+</script>
+
+<template>
+  <div
+    class="js-notebook-viewer-mounted container-fluid md prepend-top-default append-bottom-default"
+  >
+    <div v-if="loading && !error" class="text-center loading">
+      <gl-loading-icon class="mt-5" size="lg" />
+    </div>
+    <notebook-lab v-if="!loading && !error" :notebook="json" code-css-class="code white" />
+    <p v-if="error" class="text-center">
+      <span v-if="loadError" ref="loadErrorMessage">{{
+        __('An error occurred while loading the file. Please try again later.')
+      }}</span>
+      <span v-else ref="parsingErrorMessage">{{
+        __('An error occurred while parsing the file.')
+      }}</span>
+    </p>
+  </div>
+</template>

app/controllers/admin/jobs_controller.rb

@@ -3,10 +3,10 @@
 class Admin::JobsController < Admin::ApplicationController
   def index
     # We need all builds for tabs counters
-    @all_builds = JobsFinder.new(current_user: current_user).execute
+    @all_builds = Ci::JobsFinder.new(current_user: current_user).execute
     @scope = params[:scope]
-    @builds = JobsFinder.new(current_user: current_user, params: params).execute
+    @builds = Ci::JobsFinder.new(current_user: current_user, params: params).execute
     @builds = @builds.eager_load_everything
     @builds = @builds.page(params[:page]).per(30)
   end

app/controllers/projects/jobs_controller.rb

@@ -19,10 +19,10 @@ class Projects::JobsController < Projects::ApplicationController
   def index
     # We need all builds for tabs counters
-    @all_builds = JobsFinder.new(current_user: current_user, project: @project).execute
+    @all_builds = Ci::JobsFinder.new(current_user: current_user, project: @project).execute
     @scope = params[:scope]
-    @builds = JobsFinder.new(current_user: current_user, project: @project, params: params).execute
+    @builds = Ci::JobsFinder.new(current_user: current_user, project: @project, params: params).execute
     @builds = @builds.eager_load_everything
     @builds = @builds.page(params[:page]).per(30).without_count
   end

app/controllers/projects/pipeline_schedules_controller.rb

@@ -13,8 +13,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def index
     @scope = params[:scope]
-    @all_schedules = PipelineSchedulesFinder.new(@project).execute
-    @schedules = PipelineSchedulesFinder.new(@project).execute(scope: params[:scope])
+    @all_schedules = Ci::PipelineSchedulesFinder.new(@project).execute
+    @schedules = Ci::PipelineSchedulesFinder.new(@project).execute(scope: params[:scope])
       .includes(:last_pipeline)
   end
   # rubocop: enable CodeReuse/ActiveRecord

app/controllers/projects/pipelines_controller.rb

@@ -22,7 +22,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   def index
     @scope = params[:scope]
-    @pipelines = PipelinesFinder
+    @pipelines = Ci::PipelinesFinder
       .new(project, current_user, scope: @scope)
       .execute
       .page(params[:page])
@@ -251,7 +251,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
   def limited_pipelines_count(project, scope = nil)
-    finder = PipelinesFinder.new(project, current_user, scope: scope)
+    finder = Ci::PipelinesFinder.new(project, current_user, scope: scope)
     view_context.limited_counter_with_delimiter(finder.execute)
   end

app/finders/ci/jobs_finder.rb

+# frozen_string_literal: true
+
+module Ci
+  class JobsFinder
+    include Gitlab::Allowable
+
+    def initialize(current_user:, project: nil, params: {})
+      @current_user = current_user
+      @project = project
+      @params = params
+    end
+
+    def execute
+      builds = init_collection.order_id_desc
+      filter_by_scope(builds)
+    rescue Gitlab::Access::AccessDeniedError
+      Ci::Build.none
+    end
+
+    private
+
+    attr_reader :current_user, :project, :params
+
+    def init_collection
+      project ? project_builds : all_builds
+    end
+
+    def all_builds
+      raise Gitlab::Access::AccessDeniedError unless current_user&.admin?
+
+      Ci::Build.all
+    end
+
+    def project_builds
+      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project)
+
+      project.builds.relevant
+    end
+
+    def filter_by_scope(builds)
+      case params[:scope]
+      when 'pending'
+        builds.pending.reverse_order
+      when 'running'
+        builds.running.reverse_order
+      when 'finished'
+        builds.finished
+      else
+        builds
+      end
+    end
+  end
+end

app/finders/ci/pipeline_schedules_finder.rb

+# frozen_string_literal: true
+
+module Ci
+  class PipelineSchedulesFinder
+    attr_reader :project, :pipeline_schedules
+
+    def initialize(project)
+      @project = project
+      @pipeline_schedules = project.pipeline_schedules
+    end
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def execute(scope: nil)
+      scoped_schedules =
+        case scope
+        when 'active'
+          pipeline_schedules.active
+        when 'inactive'
+          pipeline_schedules.inactive
+        else
+          pipeline_schedules
+        end
+
+      scoped_schedules.order(id: :desc)
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+  end
+end

app/finders/ci/pipelines_finder.rb

+# frozen_string_literal: true
+
+module Ci
+  class PipelinesFinder
+    attr_reader :project, :pipelines, :params, :current_user
+
+    ALLOWED_INDEXED_COLUMNS = %w[id status ref updated_at user_id].freeze
+
+    def initialize(project, current_user, params = {})
+      @project = project
+      @current_user = current_user
+      @pipelines = project.all_pipelines
+      @params = params
+    end
+
+    def execute
+      unless Ability.allowed?(current_user, :read_pipeline, project)
+        return Ci::Pipeline.none
+      end
+
+      items = pipelines.no_child
+      items = by_scope(items)
+      items = by_status(items)
+      items = by_ref(items)
+      items = by_sha(items)
+      items = by_name(items)
+      items = by_username(items)
+      items = by_yaml_errors(items)
+      items = by_updated_at(items)
+      sort_items(items)
+    end
+
+    private
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def ids_for_ref(refs)
+      pipelines.where(ref: refs).group(:ref).select('max(id)')
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def from_ids(ids)
+      pipelines.unscoped.where(project_id: project.id, id: ids)
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    def branches
+      project.repository.branch_names
+    end
+
+    def tags
+      project.repository.tag_names
+    end
+
+    def by_scope(items)
+      case params[:scope]
+      when 'running'
+        items.running
+      when 'pending'
+        items.pending
+      when 'finished'
+        items.finished
+      when 'branches'
+        from_ids(ids_for_ref(branches))
+      when 'tags'
+        from_ids(ids_for_ref(tags))
+      else
+        items
+      end
+    end
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_status(items)
+      return items unless HasStatus::AVAILABLE_STATUSES.include?(params[:status])
+
+      items.where(status: params[:status])
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_ref(items)
+      if params[:ref].present?
+        items.where(ref: params[:ref])
+      else
+        items
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_sha(items)
+      if params[:sha].present?
+        items.where(sha: params[:sha])
+      else
+        items
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_name(items)
+      if params[:name].present?
+        items.joins(:user).where(users: { name: params[:name] })
+      else
+        items
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_username(items)
+      if params[:username].present?
+        items.joins(:user).where(users: { username: params[:username] })
+      else
+        items
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_yaml_errors(items)
+      case Gitlab::Utils.to_boolean(params[:yaml_errors])
+      when true
+        items.where("yaml_errors IS NOT NULL")
+      when false
+        items.where("yaml_errors IS NULL")
+      else
+        items
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    def by_updated_at(items)
+      items = items.updated_before(params[:updated_before]) if params[:updated_before].present?
+      items = items.updated_after(params[:updated_after]) if params[:updated_after].present?
+
+      items
+    end
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def sort_items(items)
+      order_by = if ALLOWED_INDEXED_COLUMNS.include?(params[:order_by])
+                   params[:order_by]
+                 else
+                   :id
+                 end
+
+      sort = if params[:sort] =~ /\A(ASC|DESC)\z/i
+               params[:sort]
+             else
+               :desc
+             end
+
+      items.order(order_by => sort)
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+  end
+end

app/finders/ci/runner_jobs_finder.rb

+# frozen_string_literal: true
+
+module Ci
+  class RunnerJobsFinder
+    attr_reader :runner, :params
+
+    ALLOWED_INDEXED_COLUMNS = %w[id].freeze
+
+    def initialize(runner, params = {})
+      @runner = runner
+      @params = params
+    end
+
+    def execute
+      items = @runner.builds
+      items = by_status(items)
+      sort_items(items)
+    end
+
+    private
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def by_status(items)
+      return items unless HasStatus::AVAILABLE_STATUSES.include?(params[:status])
+
+      items.where(status: params[:status])
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def sort_items(items)
+      return items unless ALLOWED_INDEXED_COLUMNS.include?(params[:order_by])
+
+      order_by = params[:order_by]
+      sort = if /\A(ASC|DESC)\z/i.match?(params[:sort])
+               params[:sort]
+             else
+               :desc
+             end
+
+      items.order(order_by => sort)
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+  end
+end

app/finders/jobs_finder.rb

-# frozen_string_literal: true
-
-class JobsFinder
-  include Gitlab::Allowable
-
-  def initialize(current_user:, project: nil, params: {})
-    @current_user = current_user
-    @project = project
-    @params = params
-  end
-
-  def execute
-    builds = init_collection.order_id_desc
-    filter_by_scope(builds)
-  rescue Gitlab::Access::AccessDeniedError
-    Ci::Build.none
-  end
-
-  private
-
-  attr_reader :current_user, :project, :params
-
-  def init_collection
-    project ? project_builds : all_builds
-  end
-
-  def all_builds
-    raise Gitlab::Access::AccessDeniedError unless current_user&.admin?
-
-    Ci::Build.all
-  end
-
-  def project_builds
-    raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project)
-
-    project.builds.relevant
-  end
-
-  def filter_by_scope(builds)
-    case params[:scope]
-    when 'pending'
-      builds.pending.reverse_order
-    when 'running'
-      builds.running.reverse_order
-    when 'finished'
-      builds.finished
-    else
-      builds
-    end
-  end
-end

app/finders/pipeline_schedules_finder.rb

-# frozen_string_literal: true
-
-class PipelineSchedulesFinder
-  attr_reader :project, :pipeline_schedules
-
-  def initialize(project)
-    @project = project
-    @pipeline_schedules = project.pipeline_schedules
-  end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def execute(scope: nil)
-    scoped_schedules =
-      case scope
-      when 'active'
-        pipeline_schedules.active
-      when 'inactive'
-        pipeline_schedules.inactive
-      else
-        pipeline_schedules
-      end
-
-    scoped_schedules.order(id: :desc)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end

app/finders/pipelines_finder.rb

-# frozen_string_literal: true
-
-class PipelinesFinder
-  attr_reader :project, :pipelines, :params, :current_user
-
-  ALLOWED_INDEXED_COLUMNS = %w[id status ref updated_at user_id].freeze
-
-  def initialize(project, current_user, params = {})
-    @project = project
-    @current_user = current_user
-    @pipelines = project.all_pipelines
-    @params = params
-  end
-
-  def execute
-    unless Ability.allowed?(current_user, :read_pipeline, project)
-      return Ci::Pipeline.none
-    end
-
-    items = pipelines.no_child
-    items = by_scope(items)
-    items = by_status(items)
-    items = by_ref(items)
-    items = by_sha(items)
-    items = by_name(items)
-    items = by_username(items)
-    items = by_yaml_errors(items)
-    items = by_updated_at(items)
-    sort_items(items)
-  end
-
-  private
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def ids_for_ref(refs)
-    pipelines.where(ref: refs).group(:ref).select('max(id)')
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def from_ids(ids)
-    pipelines.unscoped.where(project_id: project.id, id: ids)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  def branches
-    project.repository.branch_names
-  end
-
-  def tags
-    project.repository.tag_names
-  end
-
-  def by_scope(items)
-    case params[:scope]
-    when 'running'
-      items.running
-    when 'pending'
-      items.pending
-    when 'finished'
-      items.finished
-    when 'branches'
-      from_ids(ids_for_ref(branches))
-    when 'tags'
-      from_ids(ids_for_ref(tags))
-    else
-      items
-    end
-  end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_status(items)
-    return items unless HasStatus::AVAILABLE_STATUSES.include?(params[:status])
-
-    items.where(status: params[:status])
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_ref(items)
-    if params[:ref].present?
-      items.where(ref: params[:ref])
-    else
-      items
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_sha(items)
-    if params[:sha].present?
-      items.where(sha: params[:sha])
-    else
-      items
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_name(items)
-    if params[:name].present?
-      items.joins(:user).where(users: { name: params[:name] })
-    else
-      items
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_username(items)
-    if params[:username].present?
-      items.joins(:user).where(users: { username: params[:username] })
-    else
-      items
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_yaml_errors(items)
-    case Gitlab::Utils.to_boolean(params[:yaml_errors])
-    when true
-      items.where("yaml_errors IS NOT NULL")
-    when false
-      items.where("yaml_errors IS NULL")
-    else
-      items
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  def by_updated_at(items)
-    items = items.updated_before(params[:updated_before]) if params[:updated_before].present?
-    items = items.updated_after(params[:updated_after]) if params[:updated_after].present?
-
-    items
-  end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def sort_items(items)
-    order_by = if ALLOWED_INDEXED_COLUMNS.include?(params[:order_by])
-                 params[:order_by]
-               else
-                 :id
-               end
-
-    sort = if params[:sort] =~ /\A(ASC|DESC)\z/i
-             params[:sort]
-           else
-             :desc
-           end
-
-    items.order(order_by => sort)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end

app/finders/runner_jobs_finder.rb

-# frozen_string_literal: true
-
-class RunnerJobsFinder
-  attr_reader :runner, :params
-
-  ALLOWED_INDEXED_COLUMNS = %w[id].freeze
-
-  def initialize(runner, params = {})
-    @runner = runner
-    @params = params
-  end
-
-  def execute
-    items = @runner.builds
-    items = by_status(items)
-    sort_items(items)
-  end
-
-  private
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_status(items)
-    return items unless HasStatus::AVAILABLE_STATUSES.include?(params[:status])
-
-    items.where(status: params[:status])
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def sort_items(items)
-    return items unless ALLOWED_INDEXED_COLUMNS.include?(params[:order_by])
-
-    order_by = params[:order_by]
-    sort = if /\A(ASC|DESC)\z/i.match?(params[:sort])
-             params[:sort]
-           else
-             :desc
-           end
-
-    items.order(order_by => sort)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end

app/graphql/resolvers/concerns/resolves_pipelines.rb

@@ -30,6 +30,6 @@ module ResolvesPipelines
   end
   def resolve_pipelines(project, params = {})
-    PipelinesFinder.new(project, context[:current_user], params).execute
+    Ci::PipelinesFinder.new(project, context[:current_user], params).execute
   end
 end

app/workers/all_queues.yml

@@ -1166,7 +1166,7 @@
   :weight: 1
   :idempotent: 
 - :name: project_update_repository_storage
-  :feature_category: :source_code_management
+  :feature_category: :gitaly
   :has_external_dependencies: 
   :urgency: :low
   :resource_boundary: :unknown

app/workers/project_update_repository_storage_worker.rb

@@ -3,7 +3,7 @@
 class ProjectUpdateRepositoryStorageWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
-  feature_category :source_code_management
+  feature_category :gitaly
   def perform(project_id, new_repository_storage_key)
     project = Project.find(project_id)

changelogs/unreleased/197918-add-package-type-param-to-group-packages-api.yml

+---
+title: Add package_type as a filter option to the group packages list API endpoint
+merge_request: 26833
+author:
+type: added