From 00bf30ba9f5831e74b6990d4179bd6e4c0ce072a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 27 Oct 2016 12:34:23 +0300 Subject: Use full repository path for API calls instead of extracting name Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab_net.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/gitlab_net.rb') diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 994f8d5..ed0b705 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -21,7 +21,7 @@ class GitlabNet params = { action: cmd, changes: changes, - project: project_name(repo), + project: sanitize_path(repo), protocol: protocol } @@ -49,7 +49,7 @@ class GitlabNet def lfs_authenticate(key, repo) params = { - project: project_name(repo), + project: sanitize_path(repo), key_id: key.gsub('key-', '') } @@ -65,10 +65,10 @@ class GitlabNet JSON.parse(resp.body) rescue {} end - def merge_request_urls(repo_name, changes) + def merge_request_urls(repo_path, changes) changes = changes.join("\n") unless changes.kind_of?(String) changes = changes.encode('UTF-8', 'ASCII', invalid: :replace, replace: '') - resp = get("#{host}/merge_request_urls?project=#{URI.escape(repo_name)}&changes=#{URI.escape(changes)}") + resp = get("#{host}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}") JSON.parse(resp.body) rescue [] end @@ -118,10 +118,8 @@ class GitlabNet protected - def project_name(repo) - project_name = repo.gsub("'", "") - project_name = project_name.gsub(/\.git\Z/, "") - project_name.gsub(/\A\//, "") + def sanitize_path(repo) + repo.gsub("'", "") end def config -- cgit v1.2.1