Add latest changes from gitlab-org/gitlab@master

lib/api/entities/group_label.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class GroupLabel < Entities::Label
+    end
+  end
+end

lib/api/entities/job.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Job < Entities::JobBasic
+      # artifacts_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5)
+      expose :artifacts_file, using: Entities::JobArtifactFile, if: -> (job, opts) { job.artifacts? }
+      expose :job_artifacts, as: :artifacts, using: Entities::JobArtifact
+      expose :runner, with: Entities::Runner
+      expose :artifacts_expire_at
+    end
+  end
+end

lib/api/entities/job_artifact.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobArtifact < Grape::Entity
+      expose :file_type, :size, :filename, :file_format
+    end
+  end
+end

lib/api/entities/job_artifact_file.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobArtifactFile < Grape::Entity
+      expose :filename
+      expose :cached_size, as: :size
+    end
+  end
+end

lib/api/entities/job_basic.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobBasic < Grape::Entity
+      expose :id, :status, :stage, :name, :ref, :tag, :coverage, :allow_failure
+      expose :created_at, :started_at, :finished_at
+      expose :duration
+      expose :user, with: Entities::User
+      expose :commit, with: Entities::Commit
+      expose :pipeline, with: Entities::PipelineBasic
+
+      expose :web_url do |job, _options|
+        Gitlab::Routing.url_helpers.project_job_url(job.project, job)
+      end
+    end
+  end
+end

lib/api/entities/job_basic_with_project.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobBasicWithProject < Entities::JobBasic
+      expose :project, with: Entities::ProjectIdentity
+    end
+  end
+end

lib/api/entities/label.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Label < Entities::LabelBasic
+      with_options if: lambda { |_, options| options[:with_counts] } do
+        expose :open_issues_count do |label, options|
+          label.open_issues_count(options[:current_user])
+        end
+
+        expose :closed_issues_count do |label, options|
+          label.closed_issues_count(options[:current_user])
+        end
+
+        expose :open_merge_requests_count do |label, options|
+          label.open_merge_requests_count(options[:current_user])
+        end
+      end
+
+      expose :subscribed do |label, options|
+        label.subscribed?(options[:current_user], options[:parent])
+      end
+    end
+  end
+end

lib/api/entities/label_basic.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class LabelBasic < Grape::Entity
+      expose :id, :name, :color, :description, :description_html, :text_color
+    end
+  end
+end

lib/api/entities/personal_access_token.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class PersonalAccessToken < Grape::Entity
+      expose :id, :name, :revoked, :created_at, :scopes
+      expose :active?, as: :active
+      expose :expires_at do |personal_access_token|
+        personal_access_token.expires_at ? personal_access_token.expires_at.strftime("%Y-%m-%d") : nil
+      end
+    end
+  end
+end

lib/api/entities/personal_access_token_with_token.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class PersonalAccessTokenWithToken < Entities::PersonalAccessToken
+      expose :token
+    end
+  end
+end

lib/api/entities/project_label.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectLabel < Entities::Label
+      expose :priority do |label, options|
+        label.priority(options[:parent])
+      end
+      expose :is_project_label do |label, options|
+        label.is_a?(::ProjectLabel)
+      end
+    end
+  end
+end

lib/api/entities/releases/link.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Releases
+      class Link < Grape::Entity
+        expose :id
+        expose :name
+        expose :url
+        expose :external?, as: :external
+      end
+    end
+  end
+end

lib/api/entities/releases/source.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Releases
+      class Source < Grape::Entity
+        expose :format
+        expose :url
+      end
+    end
+  end
+end

lib/api/entities/tag_release.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    # deprecated old Release representation
+    class TagRelease < Grape::Entity
+      expose :tag, as: :tag_name
+      expose :description
+    end
+  end
+end

lib/api/entities/template.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Template < Grape::Entity
+      expose :name, :content
+    end
+  end
+end

lib/api/entities/templates_list.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class TemplatesList < Grape::Entity
+      expose :key
+      expose :name
+    end
+  end
+end

lib/backup/repository.rb

@@ -96,6 +96,7 @@ module Backup
         end
         wiki = ProjectWiki.new(project)
+        wiki.repository.remove rescue nil
         path_to_wiki_bundle = path_to_bundle(wiki)
         if File.exist?(path_to_wiki_bundle)

spec/controllers/projects/settings/operations_controller_spec.rb

@@ -196,6 +196,39 @@ describe Projects::Settings::OperationsController do
     end
   end
+  context 'prometheus integration' do
+    describe 'PATCH #update' do
+      let(:params) do
+        {
+          prometheus_integration_attributes: {
+            manual_configuration: '0',
+            api_url: 'https://gitlab.prometheus.rocks'
+          }
+        }
+      end
+
+      context 'feature flag :settings_operations_prometheus_service is enabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: true)
+        end
+
+        it_behaves_like 'PATCHable'
+      end
+
+      context 'feature flag :settings_operations_prometheus_service is disabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: false)
+        end
+
+        it_behaves_like 'PATCHable' do
+          let(:permitted_params) do
+            ActionController::Parameters.new(params.except(:prometheus_integration_attributes)).permit!
+          end
+        end
+      end
+    end
+  end
+
   private
   def project_params(project, params = {})

spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Batch diffs', :js do
+  include MergeRequestDiffHelpers
+  include RepoHelpers
+
+  let(:project) { create(:project, :repository) }
+  let(:merge_request) { create(:merge_request, source_project: project, source_branch: 'master', target_branch: 'empty-branch') }
+
+  before do
+    stub_feature_flags(single_mr_diff_view: true)
+    stub_feature_flags(diffs_batch_load: true)
+
+    sign_in(project.owner)
+
+    visit diffs_project_merge_request_path(merge_request.project, merge_request)
+    wait_for_requests
+
+    # Add discussion to first line of first file
+    click_diff_line(find('.diff-file.file-holder:first-of-type tr.line_holder.new:first-of-type'))
+    page.within('.js-discussion-note-form') do
+      fill_in('note_note', with: 'First Line Comment')
+      click_button('Comment')
+    end
+
+    # Add discussion to first line of last file
+    click_diff_line(find('.diff-file.file-holder:last-of-type tr.line_holder.new:first-of-type'))
+    page.within('.js-discussion-note-form') do
+      fill_in('note_note', with: 'Last Line Comment')
+      click_button('Comment')
+    end
+
+    wait_for_requests
+  end
+
+  it 'assigns discussions to diff files across multiple batch pages' do
+    # Reload so we know the discussions are persisting across batch loads
+    visit page.current_url
+
+    # Wait for JS to settle
+    wait_for_requests
+
+    expect(page).to have_selector('.diff-files-holder .file-holder', count: 39)
+
+    # Confirm discussions are applied to appropriate files (should be contained in multiple diff pages)
+    page.within('.diff-file.file-holder:first-of-type .notes .timeline-entry .note .note-text') do
+      expect(page).to have_content('First Line Comment')
+    end
+
+    page.within('.diff-file.file-holder:last-of-type .notes .timeline-entry .note .note-text') do
+      expect(page).to have_content('Last Line Comment')
+    end
+  end
+
+  context 'when user visits a URL with a link directly to to a discussion' do
+    context 'which is in the first batched page of diffs' do
+      it 'scrolls to the correct discussion' do
+        page.within('.diff-file.file-holder:first-of-type') do
+          click_link('just now')
+        end
+
+        visit page.current_url
+
+        wait_for_requests
+
+        # Confirm scrolled to correct UI element
+        expect(page.find('.diff-file.file-holder:first-of-type .discussion-notes .timeline-entry li.note[id]').obscured?).to be_falsey
+        expect(page.find('.diff-file.file-holder:last-of-type .discussion-notes .timeline-entry li.note[id]').obscured?).to be_truthy
+      end
+    end
+
+    context 'which is in at least page 2 of the batched pages of diffs' do
+      it 'scrolls to the correct discussion' do
+        page.within('.diff-file.file-holder:last-of-type') do
+          click_link('just now')
+        end
+
+        visit page.current_url
+
+        wait_for_requests
+
+        # Confirm scrolled to correct UI element
+        expect(page.find('.diff-file.file-holder:first-of-type .discussion-notes .timeline-entry li.note[id]').obscured?).to be_truthy
+        expect(page.find('.diff-file.file-holder:last-of-type .discussion-notes .timeline-entry li.note[id]').obscured?).to be_falsey
+      end
+    end
+  end
+
+  context 'when user switches view styles' do
+    before do
+      find('.js-show-diff-settings').click
+      click_button 'Side-by-side'
+
+      wait_for_requests
+    end
+
+    it 'has the correct discussions applied to files across batched pages' do
+      expect(page).to have_selector('.diff-files-holder .file-holder', count: 39)
+
+      page.within('.diff-file.file-holder:first-of-type .notes .timeline-entry .note .note-text') do
+        expect(page).to have_content('First Line Comment')
+      end
+
+      page.within('.diff-file.file-holder:last-of-type .notes .timeline-entry .note .note-text') do
+        expect(page).to have_content('Last Line Comment')
+      end
+    end
+  end
+end

spec/frontend/monitoring/components/charts/single_stat_spec.js

@@ -18,9 +18,53 @@ describe('Single Stat Chart component', () => {
   });
   describe('computed', () => {
-    describe('engineeringNotation', () => {
+    describe('statValue', () => {
       it('should interpolate the value and unit props', () => {
-        expect(singleStatChart.vm.engineeringNotation).toBe('91MB');
+        expect(singleStatChart.vm.statValue).toBe('91MB');
+      });
+
+      it('should change the value representation to a percentile one', () => {
+        singleStatChart.setProps({
+          graphData: {
+            ...graphDataPrometheusQuery,
+            max_value: 120,
+          },
+        });
+
+        expect(singleStatChart.vm.statValue).toContain('75.8');
+      });
+
+      it('should display NaN for non numeric max_value values', () => {
+        singleStatChart.setProps({
+          graphData: {
+            ...graphDataPrometheusQuery,
+            max_value: 'not a number',
+          },
+        });
+
+        expect(singleStatChart.vm.statValue).toContain('NaN');
+      });
+
+      it('should display NaN for missing query values', () => {
+        singleStatChart.setProps({
+          graphData: {
+            ...graphDataPrometheusQuery,
+            metrics: [
+              {
+                ...graphDataPrometheusQuery.metrics[0],
+                result: [
+                  {
+                    ...graphDataPrometheusQuery.metrics[0].result[0],
+                    value: [''],
+                  },
+                ],
+              },
+            ],
+            max_value: 120,
+          },
+        });
+
+        expect(singleStatChart.vm.statValue).toContain('NaN');
       });
     });
   });