summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-16 19:51:40 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-16 19:51:40 -0200
commita3be4aeb7a71cc940394a5f13d09e79fcafdb1d5 (patch)
tree8c13713b04535427695355d9849820b20e5dc60d
parentfe9a372c0b64b47117fc0a64dbdfb514f757ee6e (diff)
downloadgitlab-ce-a3be4aeb7a71cc940394a5f13d09e79fcafdb1d5.tar.gz
Avoid use of Hash#dig to keep compatibility with Ruby 2.1
-rw-r--r--lib/bitbucket/representation/comment.rb2
-rw-r--r--lib/bitbucket/representation/issue.rb6
-rw-r--r--lib/bitbucket/representation/pull_request.rb10
-rw-r--r--lib/bitbucket/representation/pull_request_comment.rb2
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/bitbucket/representation/comment.rb b/lib/bitbucket/representation/comment.rb
index 3c75e9368fa..4937aa9728f 100644
--- a/lib/bitbucket/representation/comment.rb
+++ b/lib/bitbucket/representation/comment.rb
@@ -6,7 +6,7 @@ module Bitbucket
end
def note
- raw.dig('content', 'raw')
+ raw.fetch('content', {}).fetch('raw', nil)
end
def created_at
diff --git a/lib/bitbucket/representation/issue.rb b/lib/bitbucket/representation/issue.rb
index 3af731753d1..054064395c3 100644
--- a/lib/bitbucket/representation/issue.rb
+++ b/lib/bitbucket/representation/issue.rb
@@ -12,11 +12,11 @@ module Bitbucket
end
def author
- raw.dig('reporter', 'username')
+ raw.fetch('reporter', {}).fetch('username', nil)
end
def description
- raw.dig('content', 'raw')
+ raw.fetch('content', {}).fetch('raw', nil)
end
def state
@@ -28,7 +28,7 @@ module Bitbucket
end
def milestone
- raw.dig('milestone', 'name')
+ raw['milestone']['name'] if raw['milestone'].present?
end
def created_at
diff --git a/lib/bitbucket/representation/pull_request.rb b/lib/bitbucket/representation/pull_request.rb
index e37c9a62c0e..eebf8093380 100644
--- a/lib/bitbucket/representation/pull_request.rb
+++ b/lib/bitbucket/representation/pull_request.rb
@@ -2,7 +2,7 @@ module Bitbucket
module Representation
class PullRequest < Representation::Base
def author
- raw.dig('author', 'username')
+ raw.fetch('author', {}).fetch('username', nil)
end
def description
@@ -36,19 +36,19 @@ module Bitbucket
end
def source_branch_name
- source_branch.dig('branch', 'name')
+ source_branch.fetch('branch', {}).fetch('name', nil)
end
def source_branch_sha
- source_branch.dig('commit', 'hash')
+ source_branch.fetch('commit', {}).fetch('hash', nil)
end
def target_branch_name
- target_branch.dig('branch', 'name')
+ target_branch.fetch('branch', {}).fetch('name', nil)
end
def target_branch_sha
- target_branch.dig('commit', 'hash')
+ target_branch.fetch('commit', {}).fetch('hash', nil)
end
private
diff --git a/lib/bitbucket/representation/pull_request_comment.rb b/lib/bitbucket/representation/pull_request_comment.rb
index 4f3809fbcea..4f8efe03bae 100644
--- a/lib/bitbucket/representation/pull_request_comment.rb
+++ b/lib/bitbucket/representation/pull_request_comment.rb
@@ -18,7 +18,7 @@ module Bitbucket
end
def parent_id
- raw.dig('parent', 'id')
+ raw.fetch('parent', {}).fetch('id', nil)
end
def inline?