summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-16 03:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-16 03:08:47 +0000
commit08ed6a867b690a04fe7a74c9ba697cf18f6107d7 (patch)
tree9561a9aeee9a57cec168b143a76e6f65fd92ae0b /lib/gitlab/git
parentb0f27742e78a4aa4208c271536b6b9d84c53b49e (diff)
downloadgitlab-ce-08ed6a867b690a04fe7a74c9ba697cf18f6107d7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
-rw-r--r--lib/gitlab/git/commit.rb2
-rw-r--r--lib/gitlab/git/tag.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index b2dc9a8a3c8..c6f762c3ee6 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -18,7 +18,7 @@ module Gitlab
:committed_date, :committer_name, :committer_email
].freeze
- attr_accessor *SERIALIZE_KEYS # rubocop:disable Lint/AmbiguousOperator
+ attr_accessor(*SERIALIZE_KEYS)
def ==(other)
return false unless other.is_a?(Gitlab::Git::Commit)
diff --git a/lib/gitlab/git/tag.rb b/lib/gitlab/git/tag.rb
index 0218f6e6232..08dbd52e3fb 100644
--- a/lib/gitlab/git/tag.rb
+++ b/lib/gitlab/git/tag.rb
@@ -10,7 +10,7 @@ module Gitlab
MAX_TAG_MESSAGE_DISPLAY_SIZE = 10.megabytes
SERIALIZE_KEYS = %i[name target target_commit message].freeze
- attr_accessor *SERIALIZE_KEYS # rubocop:disable Lint/AmbiguousOperator
+ attr_accessor(*SERIALIZE_KEYS)
class << self
def get_message(repository, tag_id)