diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-24 17:14:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-24 17:14:35 +0800 |
| commit | 83418ad846d07658303a9e79f14c51cebbb66cfa (patch) | |
| tree | f0f06ed3f3654fc6337ad3a5ec0c6397a3871a95 /lib/api/entities.rb | |
| parent | 91965cefebfa6b2199b9b48e79752bf62cd67305 (diff) | |
| parent | c5b29ed6f36779dbb96f4cdc7b1b0bce8bb8dc5e (diff) | |
| download | gitlab-ce-83418ad846d07658303a9e79f14c51cebbb66cfa.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (247 commits)
Switched CONTRIBUTING.md style guide recommendation for method chaining
Fix new offenses
Stylistic tweaks
Fix OAuth/SAML user blocking behavior
Revert "Enable Style/DotPosition"
Revert "Prefer leading style for Style/DotPosition"
Revert "Enable Style/BarePercentLiterals"
Manually correct autocorrect
Move up delegate calls
Exclude migrations from Style/MutableConstant
ActiveSupport delegation is preferred over Forwardable
Update haml_lint to work with newest rubocop
Add explanations to cops
Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
Order cops alphabetically
Don’t exclude some file in lib from rubocop
Fix new offenses
Enable Rails/Delegate
Enable Style/WordArray
...
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index ff27856b800..0e37f40a887 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -339,9 +339,6 @@ module API expose :created_at, :updated_at expose :system?, as: :system expose :noteable_id, :noteable_type - # upvote? and downvote? are deprecated, always return false - expose(:upvote?) { |note| false } - expose(:downvote?) { |note| false } end class AwardEmoji < Grape::Entity |