Rubocop: Style/CaseIndentation enabled
This commit is contained in:
parent
da884aabc7
commit
368e9a0862
3 changed files with 16 additions and 18 deletions
|
@ -96,7 +96,7 @@ Style/CaseEquality:
|
|||
Style/CaseIndentation:
|
||||
Description: 'Indentation of when in a case/when/[else/]end.'
|
||||
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-when-to-case'
|
||||
Enabled: false
|
||||
Enabled: true
|
||||
|
||||
Style/CharacterLiteral:
|
||||
Description: 'Checks for uses of character literals.'
|
||||
|
|
|
@ -7,18 +7,19 @@ class NotesFinder
|
|||
# Default to 0 to remain compatible with old clients
|
||||
last_fetched_at = Time.at(params.fetch(:last_fetched_at, 0).to_i)
|
||||
|
||||
notes = case target_type
|
||||
when "commit"
|
||||
project.notes.for_commit_id(target_id).not_inline.fresh
|
||||
when "issue"
|
||||
project.issues.find(target_id).notes.inc_author.fresh
|
||||
when "merge_request"
|
||||
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
|
||||
when "snippet", "project_snippet"
|
||||
project.snippets.find(target_id).notes.fresh
|
||||
else
|
||||
raise 'invalid target_type'
|
||||
end
|
||||
notes =
|
||||
case target_type
|
||||
when "commit"
|
||||
project.notes.for_commit_id(target_id).not_inline.fresh
|
||||
when "issue"
|
||||
project.issues.find(target_id).notes.inc_author.fresh
|
||||
when "merge_request"
|
||||
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
|
||||
when "snippet", "project_snippet"
|
||||
project.snippets.find(target_id).notes.fresh
|
||||
else
|
||||
raise 'invalid target_type'
|
||||
end
|
||||
|
||||
# Use overlapping intervals to avoid worrying about race conditions
|
||||
notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP)
|
||||
|
|
|
@ -47,16 +47,12 @@ module APIGuard
|
|||
case validate_access_token(access_token, scopes)
|
||||
when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
|
||||
raise InsufficientScopeError.new(scopes)
|
||||
|
||||
when Oauth2::AccessTokenValidationService::EXPIRED
|
||||
raise ExpiredError
|
||||
|
||||
when Oauth2::AccessTokenValidationService::REVOKED
|
||||
raise RevokedError
|
||||
|
||||
when Oauth2::AccessTokenValidationService::VALID
|
||||
@current_user = User.find(access_token.resource_owner_id)
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -121,7 +117,8 @@ module APIGuard
|
|||
|
||||
def oauth2_bearer_token_error_handler
|
||||
Proc.new do |e|
|
||||
response = case e
|
||||
response =
|
||||
case e
|
||||
when MissingTokenError
|
||||
Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
|
||||
|
||||
|
|
Loading…
Reference in a new issue