summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-27 12:34:23 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-27 16:57:57 +0300
commit00bf30ba9f5831e74b6990d4179bd6e4c0ce072a (patch)
treee55c08dafc6d0a6100aa1a3bbb49433e77699339 /lib/gitlab_net.rb
parenteae98b679b775454c630440b93f41dfdc8b1f72d (diff)
downloadgitlab-shell-00bf30ba9f5831e74b6990d4179bd6e4c0ce072a.tar.gz
Use full repository path for API calls instead of extracting namedz-support-nested-namespaces
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r--lib/gitlab_net.rb14
1 files changed, 6 insertions, 8 deletions
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