Merge branch 'zj-remove-sanitize-repo-path' into 'master'
Remove sanitize_repo_path Closes gitaly#1235 See merge request gitlab-org/gitlab-ce!20666
This commit is contained in:
commit
f66d5c5f9f
|
@ -413,20 +413,6 @@ module ProjectsHelper
|
|||
@ref || @repository.try(:root_ref)
|
||||
end
|
||||
|
||||
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1235
|
||||
def sanitize_repo_path(project, message)
|
||||
return '' unless message.present?
|
||||
|
||||
exports_path = File.join(Settings.shared['path'], 'tmp/project_exports')
|
||||
filtered_message = message.strip.gsub(exports_path, "[REPO EXPORT PATH]")
|
||||
|
||||
disk_path = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
Gitlab.config.repositories.storages[project.repository_storage].legacy_disk_path
|
||||
end
|
||||
|
||||
filtered_message.gsub(disk_path.chomp('/'), "[REPOS PATH]")
|
||||
end
|
||||
|
||||
def project_child_container_class(view_path)
|
||||
view_path == "projects/issues/issues" ? "prepend-top-default" : "project-show-#{view_path}"
|
||||
end
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
.card-body
|
||||
%pre
|
||||
:preserve
|
||||
#{h(sanitize_repo_path(@project, @project.import_error))}
|
||||
#{h(@project.import_error)}
|
||||
|
||||
= form_for @project, url: project_import_path(@project), method: :post do |f|
|
||||
= render "shared/import_form", f: f
|
||||
|
|
|
@ -290,33 +290,6 @@ describe ProjectsHelper do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#sanitizerepo_repo_path' do
|
||||
let(:project) { create(:project, :repository) }
|
||||
let(:storage_path) do
|
||||
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
Gitlab.config.repositories.storages.default.legacy_disk_path
|
||||
end
|
||||
end
|
||||
|
||||
before do
|
||||
allow(Settings.shared).to receive(:[]).with('path').and_return('/base/repo/export/path')
|
||||
end
|
||||
|
||||
it 'removes the repo path' do
|
||||
repo = File.join(storage_path, 'namespace/test.git')
|
||||
import_error = "Could not clone #{repo}\n"
|
||||
|
||||
expect(sanitize_repo_path(project, import_error)).to eq('Could not clone [REPOS PATH]/namespace/test.git')
|
||||
end
|
||||
|
||||
it 'removes the temporary repo path used for uploads/exports' do
|
||||
repo = '/base/repo/export/path/tmp/project_exports/uploads/test.tar.gz'
|
||||
import_error = "Unable to decompress #{repo}\n"
|
||||
|
||||
expect(sanitize_repo_path(project, import_error)).to eq('Unable to decompress [REPO EXPORT PATH]/uploads/test.tar.gz')
|
||||
end
|
||||
end
|
||||
|
||||
describe '#last_push_event' do
|
||||
let(:user) { double(:user, fork_of: nil) }
|
||||
let(:project) { double(:project, id: 1) }
|
||||
|
|
Loading…
Reference in New Issue