diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 18:08:51 +0300 |
commit | 1ea1db491c8bc90789acda45c9002aaa5c4dc498 (patch) | |
tree | 46d974fed38f2ea63e69bad9d43760c62611c958 /app/models | |
parent | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/prometheus_adapter.rb | 2 | ||||
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | app/models/project_wiki.rb | 2 | ||||
-rw-r--r-- | app/models/repository.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/concerns/prometheus_adapter.rb b/app/models/concerns/prometheus_adapter.rb index 99da8b81398..3deb7edba58 100644 --- a/app/models/concerns/prometheus_adapter.rb +++ b/app/models/concerns/prometheus_adapter.rb @@ -21,7 +21,7 @@ module PrometheusAdapter raise NotImplemented end - # This is a heavy-weight check if a prometheus is properly configured and accesible from GitLab. + # This is a heavy-weight check if a prometheus is properly configured and accessible from GitLab. # This actually sends a request to an external service and often it could take a long time, # Please consider using `configured?` instead if the process is running on unicorn/puma threads. def can_query? diff --git a/app/models/project.rb b/app/models/project.rb index c0103190892..a51dd3c1048 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2207,7 +2207,7 @@ class Project < ApplicationRecord end def reference_counter(type: Gitlab::GlRepository::PROJECT) - Gitlab::ReferenceCounter.new(type.identifier_for_repositorable(self)) + Gitlab::ReferenceCounter.new(type.identifier_for_container(self)) end def badges diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index 3bec0c32c2c..1abde5196de 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -65,7 +65,7 @@ class ProjectWiki # Returns the Gitlab::Git::Wiki object. def wiki @wiki ||= begin - gl_repository = Gitlab::GlRepository::WIKI.identifier_for_repositorable(project) + gl_repository = Gitlab::GlRepository::WIKI.identifier_for_container(project) raw_repository = Gitlab::Git::Repository.new(project.repository_storage, disk_path + '.git', gl_repository, full_path) create_repo!(raw_repository) unless raw_repository.exists? diff --git a/app/models/repository.rb b/app/models/repository.rb index ba0b87b7429..c0d1750fe42 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1183,7 +1183,7 @@ class Repository def initialize_raw_repository Gitlab::Git::Repository.new(project.repository_storage, disk_path + '.git', - repo_type.identifier_for_repositorable(project), + repo_type.identifier_for_container(project), project.full_path) end end |