Add latest changes from gitlab-org/gitlab@master

app/controllers/concerns/preview_markdown.rb

@@ -32,7 +32,7 @@ module PreviewMarkdown
 
   def markdown_context_params
     case controller_name
-    when 'wikis'    then { pipeline: :wiki, project_wiki: @project_wiki, page_slug: params[:id] }
+    when 'wikis'    then { pipeline: :wiki, wiki: @project_wiki, page_slug: params[:id] }
     when 'snippets' then { skip_project_check: true }
     when 'groups'   then { group: group }
     when 'projects' then projects_filter_params

app/helpers/markup_helper.rb

@@ -129,7 +129,7 @@ module MarkupHelper
     context.merge!(
       pipeline: :wiki,
       project: @project,
-      project_wiki: @project_wiki,
+      wiki: @project_wiki,
       repository: @project_wiki.repository,
       page_slug: wiki_page.slug,
       issuable_state_filter_enabled: true

app/models/container_repository.rb

@@ -67,6 +67,12 @@ class ContainerRepository < ApplicationRecord
     end
   end
 
+  def tags_count
+    return 0 unless manifest && manifest['tags']
+
+    manifest['tags'].size
+  end
+
   def blob(config)
     ContainerRegistry::Blob.new(self, config)
   end

app/serializers/container_repository_entity.rb

@@ -3,7 +3,7 @@
 class ContainerRepositoryEntity < Grape::Entity
   include RequestAwareEntity
 
-  expose :id, :name, :path, :location, :created_at, :status
+  expose :id, :name, :path, :location, :created_at, :status, :tags_count
 
   expose :tags_path do |repository|
     project_registry_repository_tags_path(project, repository, format: :json)

changelogs/unreleased/216757-add-tags-count.yml

+---
+title: Add tags_count to container registry api and controller
+merge_request: 32141
+author:
+type: changed

changelogs/unreleased/fix_nil_class_for_bytesize_error.yml

+---
+title: Fix undefined error in Gitlab::Git::Diff
+merge_request: 32967
+author:
+type: fixed

doc/api/container_registry.md

@@ -19,6 +19,7 @@ GET /projects/:id/registry/repositories
 | `id`      | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) accessible by the authenticated user. |
 | `tags`      | boolean | no | If the parameter is included as true, each repository will include an array of `"tags"` in the response. |
 | `name`      | string | no | Returns a list of repositories with a name that matches the value. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29763) in GitLab 13.0). |
+| `tags_count` | boolean | no | If the parameter is included as true, each repository will include `"tags_count"` in the response ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32141) in GitLab 13.1). |
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/registry/repositories"
@@ -60,9 +61,10 @@ GET /groups/:id/registry/repositories
 | `id`      | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) accessible by the authenticated user. |
 | `tags`      | boolean | no | If the parameter is included as true, each repository will include an array of `"tags"` in the response. |
 | `name`      | string | no | Returns a list of repositories with a name that matches the value. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29763) in GitLab 13.0). |
+| `tags_count` | boolean | no | If the parameter is included as true, each repository will include `"tags_count"` in the response ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32141) in GitLab 13.1). |
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/2/registry/repositories?tags=1"
+curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/2/registry/repositories?tags=1&tags_count=true"
 ```
 
 Example response:
@@ -76,6 +78,7 @@ Example response:
     "project_id": 9,
     "location": "gitlab.example.com:5000/group/project",
     "created_at": "2019-01-10T13:38:57.391Z",
+    "tags_count": 1,
     "tags": [
       {
         "name": "0.0.1",
@@ -91,6 +94,7 @@ Example response:
     "project_id": 11,
     "location": "gitlab.example.com:5000/group/other_project",
     "created_at": "2019-01-10T13:39:08.229Z",
+    "tags_count": 3,
     "tags": [
       {
         "name": "0.0.1",

doc/development/code_review.md

@@ -358,8 +358,8 @@ When ready to merge:
   - If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results-premium)** finished less than 2 hours ago, you
     might merge without starting a new pipeline as the merge request is close
     enough to `master`.
-  - If the merge request is from a fork, check how far behind `master` the
-    source branch is. If it's more than 100 commits behind, ask the author to
+  - If the **merge request is from a fork**, we can't use [Pipelines for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/index.md#prerequisites), therefore, they're more prone to breaking `master`.
+    Check how far behind `master` the source branch is. If it's more than 100 commits behind, ask the author to
     rebase it before merging.
   - If [master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master),
     in addition to the two above rules, check that any failure also happens

doc/user/project/issues/managing_issues.md

@@ -226,6 +226,8 @@ when used from the command line with `git commit -m`.
 
 #### Disabling automatic issue closing
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/19754) in GitLab 12.7.
+
 The automatic issue closing feature can be disabled on a per-project basis
 within the [project's repository settings](../settings/index.md). Referenced
 issues will still be displayed as such but won't be closed automatically.

lib/api/entities/container_registry.rb

@@ -16,6 +16,7 @@ module API
         expose :project_id
         expose :location
         expose :created_at
+        expose :tags_count, if: -> (_, options) { options[:tags_count] }
         expose :tags, using: Tag, if: -> (_, options) { options[:tags] }
       end
 

lib/api/group_container_repositories.rb

@@ -20,6 +20,7 @@ module API
       params do
         use :pagination
         optional :tags, type: Boolean, default: false, desc: 'Determines if tags should be included'
+        optional :tags_count, type: Boolean, default: false, desc: 'Determines if the tags count should be included'
       end
       get ':id/registry/repositories' do
         repositories = ContainerRepositoriesFinder.new(
@@ -28,7 +29,7 @@ module API
 
         track_event('list_repositories')
 
-        present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags]
+        present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags], tags_count: params[:tags_count]
       end
     end
 

lib/api/project_container_repositories.rb

@@ -21,6 +21,7 @@ module API
       params do
         use :pagination
         optional :tags, type: Boolean, default: false, desc: 'Determines if tags should be included'
+        optional :tags_count, type: Boolean, default: false, desc: 'Determines if the tags count should be included'
       end
       get ':id/registry/repositories' do
         repositories = ContainerRepositoriesFinder.new(
@@ -29,7 +30,7 @@ module API
 
         track_event( 'list_repositories')
 
-        present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags]
+        present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags], tags_count: params[:tags_count]
       end
 
       desc 'Delete repository' do

lib/banzai/filter/gollum_tags_filter.rb

@@ -30,7 +30,7 @@ module Banzai
     # Note: the table of contents tag is now handled by TableOfContentsTagFilter
     #
     # Context options:
-    #   :project_wiki (required) - Current project wiki.
+    #   :wiki [Wiki] (required) - Current wiki instance.
     #
     class GollumTagsFilter < HTML::Pipeline::Filter
       include ActionView::Helpers::TagHelper
@@ -100,8 +100,8 @@ module Banzai
 
         if url?(content)
           path = content
-        elsif file = project_wiki.find_file(content)
-          path = ::File.join project_wiki_base_path, file.path
+        elsif file = wiki.find_file(content)
+          path = ::File.join(wiki_base_path, file.path)
         end
 
         if path
@@ -134,25 +134,25 @@ module Banzai
           if url?(reference)
             reference
           else
-            ::File.join(project_wiki_base_path, reference)
+            ::File.join(wiki_base_path, reference)
           end
 
         content_tag(:a, name || reference, href: href, class: 'gfm')
       end
 
-      def project_wiki
-        context[:project_wiki]
+      def wiki
+        context[:wiki]
       end
 
-      def project_wiki_base_path
-        project_wiki && project_wiki.wiki_base_path
+      def wiki_base_path
+        wiki&.wiki_base_path
       end
 
-      # Ensure that a :project_wiki key exists in context
+      # Ensure that a :wiki key exists in context
       #
       # Note that while the key might exist, its value could be nil!
       def validate
-        needs :project_wiki
+        needs :wiki
       end
     end
   end

lib/banzai/filter/repository_link_filter.rb

@@ -10,7 +10,7 @@ module Banzai
     #   :commit
     #   :current_user
     #   :project
-    #   :project_wiki
+    #   :wiki
     #   :ref
     #   :requested_path
     #   :system_note
@@ -53,7 +53,7 @@ module Banzai
 
       def linkable_files?
         strong_memoize(:linkable_files) do
-          context[:project_wiki].nil? && repository.try(:exists?) && !repository.empty?
+          context[:wiki].nil? && repository.try(:exists?) && !repository.empty?
         end
       end
 

lib/banzai/filter/wiki_link_filter.rb

@@ -6,12 +6,12 @@ module Banzai
     # Rewrite rules are documented in the `WikiPipeline` spec.
     #
     # Context options:
-    #   :project_wiki
+    #   :wiki
     class WikiLinkFilter < HTML::Pipeline::Filter
       include Gitlab::Utils::SanitizeNodeLink
 
       def call
-        return doc unless project_wiki?
+        return doc unless wiki?
 
         doc.search('a:not(.gfm)').each { |el| process_link(el.attribute('href'), el) }
 
@@ -33,8 +33,8 @@ module Banzai
         remove_unsafe_links({ node: node }, remove_invalid_links: false)
       end
 
-      def project_wiki?
-        !context[:project_wiki].nil?
+      def wiki?
+        !context[:wiki].nil?
       end
 
       def process_link_attr(html_attr)
@@ -46,7 +46,7 @@ module Banzai
       end
 
       def apply_rewrite_rules(link_string)
-        Rewriter.new(link_string, wiki: context[:project_wiki], slug: context[:page_slug]).apply_rules
+        Rewriter.new(link_string, wiki: context[:wiki], slug: context[:page_slug]).apply_rules
       end
     end
   end

lib/gitlab/git/diff.rb

@@ -225,7 +225,7 @@ module Gitlab
       end
 
       def init_from_gitaly(diff)
-        @diff = encode!(diff.patch) if diff.respond_to?(:patch)
+        @diff = diff.respond_to?(:patch) ? encode!(diff.patch) : ''
         @new_path = encode!(diff.to_path.dup)
         @old_path = encode!(diff.from_path.dup)
         @a_mode = diff.old_mode.to_s(8)

package.json

@@ -41,11 +41,11 @@
     "@babel/preset-env": "^7.8.4",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.130.0",
-    "@gitlab/ui": "14.17.0",
+    "@gitlab/ui": "15.5.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3",
     "@sentry/browser": "^5.10.2",
-    "@sourcegraph/code-host-integration": "0.0.46",
+    "@sourcegraph/code-host-integration": "0.0.47",
     "@toast-ui/editor": "^2.0.1",
     "@toast-ui/vue-editor": "^2.0.1",
     "apollo-cache-inmemory": "^1.6.3",

spec/controllers/groups/registry/repositories_controller_spec.rb

@@ -17,6 +17,7 @@ describe Groups::Registry::RepositoriesController do
 
   before do
     stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any, tags: [])
     group.add_owner(user)
     group.add_guest(guest)
     sign_in(user)

spec/controllers/projects/registry/repositories_controller_spec.rb

@@ -46,7 +46,7 @@ describe Projects::Registry::RepositoriesController do
       context 'when root container repository is not created' do
         context 'when there are tags for this repository' do
           before do
-            stub_container_registry_tags(repository: project.full_path,
+            stub_container_registry_tags(repository: :any,
                                          tags: %w[rc1 latest])
           end
 

spec/features/markdown/copy_as_gfm_spec.rb

@@ -157,7 +157,7 @@ describe 'Copy as GFM', :js do
         GFM
 
         pipeline: :wiki,
-        project_wiki: @project.wiki
+        wiki: @project.wiki
       )
 
       verify(

spec/features/markdown/markdown_spec.rb

@@ -269,15 +269,15 @@ describe 'GitLab Markdown', :aggregate_failures do
 
   context 'wiki pipeline' do
     before do
-      @project_wiki = @feat.project_wiki
-      @project_wiki_page = @feat.project_wiki_page
+      @wiki = @feat.wiki
+      @wiki_page = @feat.wiki_page
 
       path = 'images/example.jpg'
       gitaly_wiki_file = Gitlab::GitalyClient::WikiFile.new(path: path)
-      expect(@project_wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file))
-      allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
+      expect(@wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file))
+      allow(@wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
 
-      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug })
+      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, wiki: @wiki, page_slug: @wiki_page.slug })
     end
 
     it_behaves_like 'all pipelines'

spec/fixtures/api/schemas/registry/repository.json

 {
   "type": "object",
-  "required" : [
-    "id",
-    "name",
-    "path",
-    "location",
-    "created_at"
-  ],
-  "properties" : {
+  "required": ["id", "name", "path", "location", "created_at"],
+  "properties": {
     "id": {
       "type": "integer"
     },
@@ -38,7 +32,10 @@
         { "type": "string", "enum": ["delete_scheduled", "delete_failed"] }
       ]
     },
-    "tags": { "$ref": "tags.json" }
+    "tags": { "$ref": "tags.json" },
+    "tags_count": {
+      "type": "integer"
+    }
   },
   "additionalProperties": false
 }

spec/helpers/markup_helper_spec.rb

@@ -317,7 +317,7 @@ describe MarkupHelper do
     let(:wiki_repository) { double('Repository') }
     let(:context) do
       {
-        pipeline: :wiki, project: project, project_wiki: wiki,
+        pipeline: :wiki, project: project, wiki: wiki,
         page_slug: 'nested/page', issuable_state_filter_enabled: true,
         repository: wiki_repository
       }

spec/lib/banzai/filter/gollum_tags_filter_spec.rb

@@ -7,11 +7,11 @@ describe Banzai::Filter::GollumTagsFilter do
 
   let(:project) { create(:project) }
   let(:user) { double }
-  let(:project_wiki) { ProjectWiki.new(project, user) }
+  let(:wiki) { ProjectWiki.new(project, user) }
 
   describe 'validation' do
-    it 'ensure that a :project_wiki key exists in context' do
-      expect { filter("See [[images/image.jpg]]", {}) }.to raise_error ArgumentError, "Missing context keys for Banzai::Filter::GollumTagsFilter: :project_wiki"
+    it 'ensure that a :wiki key exists in context' do
+      expect { filter("See [[images/image.jpg]]", {}) }.to raise_error ArgumentError, "Missing context keys for Banzai::Filter::GollumTagsFilter: :wiki"
     end
   end
 
@@ -23,19 +23,19 @@ describe Banzai::Filter::GollumTagsFilter do
                                   path: 'images/image.jpg',
                                   raw_data: '')
       wiki_file = Gitlab::Git::WikiFile.new(gollum_file_double)
-      expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file)
+      expect(wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file)
 
       tag = '[[images/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
-      expect(doc.at_css('img')['data-src']).to eq "#{project_wiki.wiki_base_path}/images/image.jpg"
+      expect(doc.at_css('img')['data-src']).to eq "#{wiki.wiki_base_path}/images/image.jpg"
     end
 
     it 'does not creates img tag if image does not exist' do
-      expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(nil)
+      expect(wiki).to receive(:find_file).with('images/image.jpg').and_return(nil)
 
       tag = '[[images/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.css('img').size).to eq 0
     end
@@ -44,14 +44,14 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking external images' do
     it 'creates img tag for valid URL' do
       tag = '[[http://example.com/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('img')['data-src']).to eq "http://example.com/image.jpg"
     end
 
     it 'does not creates img tag for invalid URL' do
       tag = '[[http://example.com/image.pdf]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.css('img').size).to eq 0
     end
@@ -60,7 +60,7 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking external resources' do
     it "the created link's text will be equal to the resource's text" do
       tag = '[[http://example.com]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('a').text).to eq 'http://example.com'
       expect(doc.at_css('a')['href']).to eq 'http://example.com'
@@ -68,7 +68,7 @@ describe Banzai::Filter::GollumTagsFilter do
 
     it "the created link's text will be link-text" do
       tag = '[[link-text|http://example.com/pdfs/gollum.pdf]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('a').text).to eq 'link-text'
       expect(doc.at_css('a')['href']).to eq 'http://example.com/pdfs/gollum.pdf'
@@ -78,8 +78,8 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking internal resources' do
     it "the created link's text includes the resource's text and wiki base path" do
       tag = '[[wiki-slug]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
-      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')
+      doc = filter("See #{tag}", wiki: wiki)
+      expected_path = ::File.join(wiki.wiki_base_path, 'wiki-slug')
 
       expect(doc.at_css('a').text).to eq 'wiki-slug'
       expect(doc.at_css('a')['href']).to eq expected_path
@@ -87,15 +87,15 @@ describe Banzai::Filter::GollumTagsFilter do
 
     it "the created link's text will be link-text" do
       tag = '[[link-text|wiki-slug]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
-      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')
+      doc = filter("See #{tag}", wiki: wiki)
+      expected_path = ::File.join(wiki.wiki_base_path, 'wiki-slug')
 
       expect(doc.at_css('a').text).to eq 'link-text'
       expect(doc.at_css('a')['href']).to eq expected_path
     end
 
     it "inside back ticks will be exempt from linkification" do
-      doc = filter('<code>[[link-in-backticks]]</code>', project_wiki: project_wiki)
+      doc = filter('<code>[[link-in-backticks]]</code>', wiki: wiki)
 
       expect(doc.at_css('code').text).to eq '[[link-in-backticks]]'
     end

spec/lib/banzai/filter/repository_link_filter_spec.rb

@@ -12,7 +12,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       project:        project,
       current_user:   user,
       group:          group,
-      project_wiki:   project_wiki,
+      wiki:           wiki,
       ref:            ref,
       requested_path: requested_path,
       only_path:      only_path
@@ -53,7 +53,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
   let(:project_path)   { project.full_path }
   let(:ref)            { 'markdown' }
   let(:commit)         { project.commit(ref) }
-  let(:project_wiki)   { nil }
+  let(:wiki)           { nil }
   let(:requested_path) { '/' }
   let(:only_path)      { true }
 
@@ -94,8 +94,8 @@ describe Banzai::Filter::RepositoryLinkFilter do
     end
   end
 
-  context 'with a project_wiki' do
-    let(:project_wiki) { double('ProjectWiki') }
+  context 'with a wiki' do
+    let(:wiki) { double('ProjectWiki') }
 
     include_examples :preserve_unchanged
   end

spec/lib/banzai/filter/wiki_link_filter_spec.rb

@@ -12,13 +12,13 @@ describe Banzai::Filter::WikiLinkFilter do
   let(:repository_upload_folder) { Wikis::CreateAttachmentService::ATTACHMENT_PATH }
 
   it "doesn't rewrite absolute links" do
-    filtered_link = filter("<a href='http://example.com:8000/'>Link</a>", project_wiki: wiki).children[0]
+    filtered_link = filter("<a href='http://example.com:8000/'>Link</a>", wiki: wiki).children[0]
 
     expect(filtered_link.attribute('href').value).to eq('http://example.com:8000/')
   end
 
   it "doesn't rewrite links to project uploads" do
-    filtered_link = filter("<a href='/uploads/a.test'>Link</a>", project_wiki: wiki).children[0]
+    filtered_link = filter("<a href='/uploads/a.test'>Link</a>", wiki: wiki).children[0]
 
     expect(filtered_link.attribute('href').value).to eq('/uploads/a.test')
   end
@@ -26,7 +26,7 @@ describe Banzai::Filter::WikiLinkFilter do
   describe "when links point to the #{Wikis::CreateAttachmentService::ATTACHMENT_PATH} folder" do
     context 'with an "a" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<a href='#{repository_upload_folder}/a.test'>Link</a>", project_wiki: wiki).children[0]
+        filtered_link = filter("<a href='#{repository_upload_folder}/a.test'>Link</a>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('href').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.test")
       end
@@ -37,7 +37,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
       context 'inside an "a" html tag' do
         it 'rewrites links' do
-          filtered_elements = filter("<a href='#{repository_upload_folder}/a.jpg'><img src='#{repository_upload_folder}/a.jpg'>example</img></a>", project_wiki: wiki)
+          filtered_elements = filter("<a href='#{repository_upload_folder}/a.jpg'><img src='#{repository_upload_folder}/a.jpg'>example</img></a>", wiki: wiki)
 
           expect(filtered_elements.search('img').first.attribute('src').value).to eq(path)
           expect(filtered_elements.search('a').first.attribute('href').value).to eq(path)
@@ -46,7 +46,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
       context 'outside an "a" html tag' do
         it 'rewrites links' do
-          filtered_link = filter("<img src='#{repository_upload_folder}/a.jpg'>example</img>", project_wiki: wiki).children[0]
+          filtered_link = filter("<img src='#{repository_upload_folder}/a.jpg'>example</img>", wiki: wiki).children[0]
 
           expect(filtered_link.attribute('src').value).to eq(path)
         end
@@ -55,7 +55,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     context 'with "video" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<video src='#{repository_upload_folder}/a.mp4'></video>", project_wiki: wiki).children[0]
+        filtered_link = filter("<video src='#{repository_upload_folder}/a.mp4'></video>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('src').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.mp4")
       end
@@ -63,7 +63,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     context 'with "audio" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<audio src='#{repository_upload_folder}/a.wav'></audio>", project_wiki: wiki).children[0]
+        filtered_link = filter("<audio src='#{repository_upload_folder}/a.wav'></audio>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('src').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.wav")
       end
@@ -75,7 +75,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     invalid_links.each do |invalid_link|
       it "doesn't rewrite invalid invalid_links like #{invalid_link}" do
-        filtered_link = filter("<a href='#{invalid_link}'>Link</a>", project_wiki: wiki).children[0]
+        filtered_link = filter("<a href='#{invalid_link}'>Link</a>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('href').value).to eq(invalid_link)
       end

spec/lib/banzai/pipeline/wiki_pipeline_spec.rb

@@ -13,7 +13,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      result = described_class.call(markdown, project: spy, project_wiki: spy)
+      result = described_class.call(markdown, project: spy, wiki: spy)
 
       aggregate_failures do
         expect(result[:output].text).not_to include '[['
@@ -31,7 +31,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      output = described_class.to_html(markdown, project: spy, project_wiki: spy)
+      output = described_class.to_html(markdown, project: spy, wiki: spy)
 
       expect(output).to include('[[<em>toc</em>]]')
     end
@@ -44,7 +44,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      output = described_class.to_html(markdown, project: spy, project_wiki: spy)
+      output = described_class.to_html(markdown, project: spy, wiki: spy)
 
       aggregate_failures do
         expect(output).not_to include('<ul>')
@@ -56,8 +56,8 @@ describe Banzai::Pipeline::WikiPipeline do
   describe "Links" do
     let(:namespace) { create(:namespace, name: "wiki_link_ns") }
     let(:project)   { create(:project, :public, name: "wiki_link_project", namespace: namespace) }
-    let(:project_wiki) { ProjectWiki.new(project, double(:user)) }
-    let(:page) { build(:wiki_page, wiki: project_wiki, title: 'nested/twice/start-page') }
+    let(:wiki) { ProjectWiki.new(project, double(:user)) }
+    let(:page) { build(:wiki_page, wiki: wiki, title: 'nested/twice/start-page') }
 
     { 'when GitLab is hosted at a root URL' => '',
       'when GitLab is hosted at a relative URL' => '/nested/relative/gitlab' }.each do |test_name, relative_url_root|
@@ -70,14 +70,14 @@ describe Banzai::Pipeline::WikiPipeline do
           context "when creating hierarchical links to the current directory" do
             it "rewrites non-file links to be at the scope of the current directory" do
               markdown = "[Page](./page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page\"")
             end
 
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](./page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
@@ -86,14 +86,14 @@ describe Banzai::Pipeline::WikiPipeline do
           context "when creating hierarchical links to the parent directory" do
             it "rewrites non-file links to be at the scope of the parent directory" do
               markdown = "[Link to Page](../page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page\"")
             end
 
             it "rewrites file links to be at the scope of the parent directory" do
               markdown = "[Link to Page](../page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page.md\"")
             end
@@ -102,14 +102,14 @@ describe Banzai::Pipeline::WikiPipeline do
           context "when creating hierarchical links to a sub-directory" do
             it "rewrites non-file links to be at the scope of the sub-directory" do
               markdown = "[Link to Page](./subdirectory/page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page\"")
             end
 
             it "rewrites file links to be at the scope of the sub-directory" do
               markdown = "[Link to Page](./subdirectory/page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page.md\"")
             end
@@ -118,35 +118,35 @@ describe Banzai::Pipeline::WikiPipeline do
           describe "when creating non-hierarchical links" do
             it 'rewrites non-file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
 
             it 'rewrites non-file links (with spaces) to be at the scope of the wiki root' do
               markdown = "[Link to Page](page slug)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page%20slug\"")
             end
 
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
 
             it 'rewrites links with anchor' do
               markdown = '[Link to Header](start-page#title)'
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start-page#title\"")
             end
 
             it 'rewrites links (with spaces) with anchor' do
               markdown = '[Link to Header](start page#title)'
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start%20page#title\"")
             end
@@ -155,14 +155,14 @@ describe Banzai::Pipeline::WikiPipeline do
           describe "when creating root links" do
             it 'rewrites non-file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](/page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
 
             it 'rewrites file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](/page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page.md\"")
             end
@@ -172,7 +172,7 @@ describe Banzai::Pipeline::WikiPipeline do
         describe "linking to pages outside the wiki (absolute)" do
           it "doesn't rewrite links" do
             markdown = "[Link to Page](http://example.com/page)"
-            output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+            output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
             expect(output).to include('href="http://example.com/page"')
           end
@@ -188,7 +188,7 @@ describe Banzai::Pipeline::WikiPipeline do
           output = described_class.to_html(
             "[Link](./alert(1);)",
             project: project,
-            project_wiki: project_wiki,
+            wiki: wiki,
             page_slug: valid_slug
           )
 
@@ -199,7 +199,7 @@ describe Banzai::Pipeline::WikiPipeline do
           output = described_class.to_html(
             "[Link](../alert(1);)",
             project: project,
-            project_wiki: project_wiki,
+            wiki: wiki,
             page_slug: valid_slug
           )
 
@@ -236,7 +236,7 @@ describe Banzai::Pipeline::WikiPipeline do
                 output = described_class.to_html(
                   "[Link](./#{link})",
                   project: project,
-                  project_wiki: project_wiki,
+                  wiki: wiki,
                   page_slug: slug
                 )
 
@@ -247,7 +247,7 @@ describe Banzai::Pipeline::WikiPipeline do
                 output = described_class.to_html(
                   "[Link](../#{link})",
                   project: project,
-                  project_wiki: project_wiki,
+                  wiki: wiki,
                   page_slug: slug
                 )
 
@@ -263,33 +263,33 @@ describe Banzai::Pipeline::WikiPipeline do
   describe 'videos and audio' do
     let_it_be(:namespace) { create(:namespace, name: "wiki_link_ns") }
     let_it_be(:project)   { create(:project, :public, name: "wiki_link_project", namespace: namespace) }
-    let_it_be(:project_wiki) { ProjectWiki.new(project, double(:user)) }
-    let_it_be(:page) { build(:wiki_page, wiki: project_wiki, title: 'nested/twice/start-page') }
+    let_it_be(:wiki) { ProjectWiki.new(project, double(:user)) }
+    let_it_be(:page) { build(:wiki_page, wiki: wiki, title: 'nested/twice/start-page') }
 
     it 'generates video html structure' do
       markdown = "![video_file](video_file_name.mp4)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video_file_name.mp4"')
     end
 
     it 'rewrites and replaces video links names with white spaces to %20' do
       markdown = "![video file](video file name.mp4)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video%20file%20name.mp4"')
     end
 
     it 'generates audio html structure' do
       markdown = "![audio_file](audio_file_name.wav)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio_file_name.wav"')
     end
 
     it 'rewrites and replaces audio links names with white spaces to %20' do
       markdown = "![audio file](audio file name.wav)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio%20file%20name.wav"')
     end

spec/lib/gitlab/git/diff_spec.rb

@@ -122,6 +122,36 @@ EOT
         end
       end
     end
+
+    context 'using a Gitaly::CommitDelta' do
+      let(:commit_delta) do
+        Gitaly::CommitDelta.new(
+          to_path: ".gitmodules",
+          from_path: ".gitmodules",
+          old_mode: 0100644,
+          new_mode: 0100644,
+          from_id: '357406f3075a57708d0163752905cc1576fceacc',
+          to_id: '8e5177d718c561d36efde08bad36b43687ee6bf0'
+        )
+      end
+      let(:diff) { described_class.new(commit_delta) }
+
+      it 'initializes the diff' do
+        expect(diff.to_hash).to eq(@raw_diff_hash.merge(diff: ''))
+      end
+
+      it 'is not too large' do
+        expect(diff).not_to be_too_large
+      end
+
+      it 'has an empty diff' do
+        expect(diff.diff).to be_empty
+      end
+
+      it 'is not a binary' do
+        expect(diff).not_to have_binary_notice
+      end
+    end
   end
 
   describe 'straight diffs' do

spec/models/container_repository_spec.rb

@@ -81,6 +81,12 @@ describe ContainerRepository do
     end
   end
 
+  describe '#tags_count' do
+    it 'returns the count of tags' do
+      expect(repository.tags_count).to eq(1)
+    end
+  end
+
   describe '#has_tags?' do
     it 'has tags' do
       expect(repository).to have_tags

spec/requests/groups/registry/repositories_controller_spec.rb

@@ -8,7 +8,7 @@ describe Groups::Registry::RepositoriesController do
 
   before do
     stub_container_registry_config(enabled: true)
-
+    stub_container_registry_tags(repository: :any, tags: [])
     group.add_reporter(user)
     login_as(user)
   end

spec/serializers/container_repository_entity_spec.rb

@@ -13,12 +13,14 @@ describe ContainerRepositoryEntity do
 
   before do
     stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any,
+      tags: %w[stable latest])
     allow(request).to receive(:project).and_return(project)
     allow(request).to receive(:current_user).and_return(user)
   end
 
   it 'exposes required informations' do
-    expect(subject).to include(:id, :path, :location, :tags_path)
+    expect(subject).to include(:id, :path, :location, :tags_path, :tags_count)
   end
 
   context 'when project is not preset in the request' do

spec/support/helpers/markdown_feature.rb

@@ -36,12 +36,12 @@ class MarkdownFeature
     end
   end
 
-  def project_wiki
-    @project_wiki ||= ProjectWiki.new(project, user)
+  def wiki
+    @wiki ||= ProjectWiki.new(project, user)
   end
 
-  def project_wiki_page
-    @project_wiki_page ||= build(:wiki_page, wiki: project_wiki)
+  def wiki_page
+    @wiki_page ||= build(:wiki_page, wiki: wiki)
   end
 
   def issue

spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb

@@ -54,6 +54,29 @@ RSpec.shared_examples 'returns repositories for allowed users' do |user_type, sc
         expect(response).to match_response_schema('registry/repositories')
       end
     end
+
+    context 'with tags_count param' do
+      let(:url) { "/#{scope}s/#{object.id}/registry/repositories?tags_count=true" }
+
+      before do
+        stub_container_registry_tags(repository: root_repository.path, tags: %w(rootA latest), with_manifest: true)
+        stub_container_registry_tags(repository: test_repository.path, tags: %w(rootA latest), with_manifest: true)
+      end
+
+      it 'returns a list of repositories and their tags_count' do
+        subject
+
+        expect(response.body).to include('tags_count')
+        expect(json_response[0]['tags_count']).to eq(2)
+      end
+
+      it 'returns a matching schema' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to match_response_schema('registry/repositories')
+      end
+    end
   end
 end
 

yarn.lock

@@ -787,10 +787,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.130.0.tgz#0c2f3cdc0a4b0f54c47b2861c8fa31b2a58c570a"
   integrity sha512-azJ1E9PBk6fGOaP6816BSr8oYrQu3m3BbYZwWOCUp8AfbZuf0ZOZVYmlR9i/eAOhoqqqmwF8hYCK2VjAklbpPA==
 
-"@gitlab/ui@14.17.0":
-  version "14.17.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.17.0.tgz#668f08318e9ef4d36a05c1ec13d531a8e46983b4"
-  integrity sha512-p75/lFQ0w5Mlg0DMdF2g/LW8DTJoSua4Xoh9BQO80o+Kw3ALQFOvvZAx17AW/MbgRD775I7Yv3V84H+s/xUqwg==
+"@gitlab/ui@15.5.0":
+  version "15.5.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-15.5.0.tgz#96b563875ab8f587ee0e55d16c14c98f1d698957"
+  integrity sha512-AmYPR5X2UtipfkrZd8e8VvOo26YKHfXT+2XRd+Hysjdg+DBaGcUDTbO67cMb9dKkFPSgPdN67SgV+C8CBuBONQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
@@ -1040,10 +1040,10 @@
     "@sentry/types" "5.10.0"
     tslib "^1.9.3"
 
-"@sourcegraph/code-host-integration@0.0.46":
-  version "0.0.46"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.46.tgz#05e4cda671ed00450be12461e6a3caff473675aa"
-  integrity sha512-ghzfaV5ydSWTamLPIDLl5tRvTtM2MBDRmQbWTPg9ZoCP/eHk61uCTAFEq02lsefDQHISZHldeClqRYhZvGDZfw==
+"@sourcegraph/code-host-integration@0.0.47":
+  version "0.0.47"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.47.tgz#ad1b5aa70f90c9f46e8b7e4152602ab0ecc26c5a"
+  integrity sha512-2HtYcsch9PO/UUegA1p5fFjy0AMM35Hq8dsFJ9tkbqIQZcys2zW+giaXJVfforR6kxYPFo3otkqPD4Vpyi48pg==
 
 "@toast-ui/editor@^2.0.1":
   version "2.0.1"