summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-03-28 09:21:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-28 09:21:32 +0000
commitc43e18fc495f66c4a96c9a72bdda72392fb0ea32 (patch)
tree6a15efa5bb9280c76e322f9be3e8661227f58c7a /lib
parent066d2e0a9cc7f6bcd56115c031168b775a2374fd (diff)
downloadgitlab-ce-c43e18fc495f66c4a96c9a72bdda72392fb0ea32.tar.gz
Remove some easy cases of 'path_to_repo' use
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/bare_repository_import/importer.rb2
-rw-r--r--lib/gitlab/workhorse.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
index 884a3de8f62..1a25138e7d6 100644
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -63,7 +63,7 @@ module Gitlab
log " * Created #{project.name} (#{project_full_path})".color(:green)
project.write_repository_config
- project.repository.create_hooks
+ Gitlab::Git::Repository.create_hooks(project.repository.path_to_repo, Gitlab.config.gitlab_shell.hooks_path)
ProjectCacheWorker.perform_async(project.id)
else
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 1887f0dc2b3..14f58087780 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -21,12 +21,10 @@ module Gitlab
raise "Unsupported action: #{action}" unless ALLOWED_GIT_HTTP_ACTIONS.include?(action.to_s)
project = repository.project
- repo_path = repository.path_to_repo
params = {
GL_ID: Gitlab::GlId.gl_id(user),
GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
GL_USERNAME: user&.username,
- RepoPath: repo_path,
ShowAllRefs: show_all_refs
}
server = {