diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 00:08:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 00:08:00 +0300 |
| commit | 100a5e4beade0d9b636791f347506106829781c3 (patch) | |
| tree | 993702f5225410b6ff1fd984afa244580071d71e /app | |
| parent | 6fdf80d94aa10083253dad7d0eaa6204be29c843 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/preview_markdown.rb | 2 | ||||
| -rw-r--r-- | app/helpers/markup_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/container_repository.rb | 6 | ||||
| -rw-r--r-- | app/serializers/container_repository_entity.rb | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/concerns/preview_markdown.rb b/app/controllers/concerns/preview_markdown.rb index ba15d611c0d..d8a1a758a0d 100644 --- a/app/controllers/concerns/preview_markdown.rb +++ b/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 diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 4f66356c27e..1a1daa297c6 100644 --- a/app/helpers/markup_helper.rb +++ b/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 diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 455c672cea3..e7e7003c2a4 100644 --- a/app/models/container_repository.rb +++ b/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 diff --git a/app/serializers/container_repository_entity.rb b/app/serializers/container_repository_entity.rb index 46aa0adc5a0..4c87d1438b0 100644 --- a/app/serializers/container_repository_entity.rb +++ b/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) |