diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-28 22:26:33 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-28 22:26:33 -0700 |
commit | a4cbbfe465d54422613171bfd38ffd64d42c8249 (patch) | |
tree | cd65ffeaf9627f98f6afdb5595dd40dd164cdd72 /lib/bitbucket_server | |
parent | bba5975a728002f7db8ca1fabfac8d3d719b6053 (diff) | |
download | gitlab-ce-a4cbbfe465d54422613171bfd38ffd64d42c8249.tar.gz |
Fix Rubocop complaints
Diffstat (limited to 'lib/bitbucket_server')
-rw-r--r-- | lib/bitbucket_server/client.rb | 25 | ||||
-rw-r--r-- | lib/bitbucket_server/representation/comment.rb | 2 | ||||
-rw-r--r-- | lib/bitbucket_server/representation/pull_request_comment.rb | 19 | ||||
-rw-r--r-- | lib/bitbucket_server/representation/repo.rb | 2 |
4 files changed, 11 insertions, 37 deletions
diff --git a/lib/bitbucket_server/client.rb b/lib/bitbucket_server/client.rb index c3cb1608187..e632adea68c 100644 --- a/lib/bitbucket_server/client.rb +++ b/lib/bitbucket_server/client.rb @@ -6,16 +6,6 @@ module BitbucketServer @connection = Connection.new(options) end - def issues(repo) - path = "/repositories/#{repo}/issues" - get_collection(path, :issue) - end - - def issue_comments(repo, issue_id) - path = "/repositories/#{repo}/issues/#{issue_id}/comments" - get_collection(path, :comment) - end - def pull_requests(project_key, repo) path = "/projects/#{project_key}/repos/#{repo}/pull-requests?state=ALL" get_collection(path, :pull_request) @@ -23,13 +13,7 @@ module BitbucketServer def activities(project_key, repo, pull_request) path = "/projects/#{project_key}/repos/#{repo}/pull-requests/#{pull_request}/activities" - - collection = get_collection(path, :activity) - end - - def pull_request_diff(project_key, repo, pull_request) - path = "/projects/#{project_key}/repos/#{repo}/pull-requests/#{pull_request}/diff" - connection.get(path) + get_collection(path, :activity) end def repo(project, repo_name) @@ -43,13 +27,6 @@ module BitbucketServer get_collection(path, :repo) end - def user - @user ||= begin - parsed_response = connection.get('/user') - BitbucketServer::Representation::User.new(parsed_response) - end - end - private def get_collection(path, type) diff --git a/lib/bitbucket_server/representation/comment.rb b/lib/bitbucket_server/representation/comment.rb index 07a8b359db7..44f76139fc4 100644 --- a/lib/bitbucket_server/representation/comment.rb +++ b/lib/bitbucket_server/representation/comment.rb @@ -55,7 +55,7 @@ module BitbucketServer comments.each do |comment| new_comments = comment.delete('comments') workset << new_comments if new_comments - all_comments << Comment.new({ 'comment' => comment}) + all_comments << Comment.new({ 'comment' => comment }) end end diff --git a/lib/bitbucket_server/representation/pull_request_comment.rb b/lib/bitbucket_server/representation/pull_request_comment.rb index 3763ba13816..c7d08e604fd 100644 --- a/lib/bitbucket_server/representation/pull_request_comment.rb +++ b/lib/bitbucket_server/representation/pull_request_comment.rb @@ -35,7 +35,7 @@ module BitbucketServer end def added? - line_type == 'ADDED' + line_type == 'ADDED' end def removed? @@ -67,17 +67,16 @@ module BitbucketServer end def line_position - @line_position ||= - diff_hunks.each do |hunk| - segments = hunk.fetch('segments', []) - segments.each do |segment| - lines = segment.fetch('lines', []) - lines.each do |line| - if line['commentIds']&.include?(id) - return [line['source'], line['destination']] - end + @line_position ||= diff_hunks.each do |hunk| + segments = hunk.fetch('segments', []) + segments.each do |segment| + lines = segment.fetch('lines', []) + lines.each do |line| + if line['commentIds']&.include?(id) + return [line['source'], line['destination']] end end + end end end diff --git a/lib/bitbucket_server/representation/repo.rb b/lib/bitbucket_server/representation/repo.rb index 38778645966..2f3a60b204b 100644 --- a/lib/bitbucket_server/representation/repo.rb +++ b/lib/bitbucket_server/representation/repo.rb @@ -1,8 +1,6 @@ module BitbucketServer module Representation class Repo < Representation::Base - attr_reader :owner, :slug - def initialize(raw) super(raw) end |