diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-03 04:48:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-03 04:48:32 +0000 |
| commit | 832b63b53817cae84d8b971ce335806713ba20a1 (patch) | |
| tree | 07fffcaa75a99942ac30e3b06260a0a24a7a089d /lib/api | |
| parent | 7dad2663a671be5cc70db63333dfe033984452d0 (diff) | |
| parent | afb8ecc3d1569520379a2d0613137c46d44a12ce (diff) | |
| download | gitlab-ce-832b63b53817cae84d8b971ce335806713ba20a1.tar.gz | |
Merge branch 'ruby-hash-1-9' into 'master'
Ruby hash 1.9 with rubycop check
See merge request !1460
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/api_guard.rb | 4 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb index 23975518181..28765b142f6 100644 --- a/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb @@ -146,7 +146,7 @@ module APIGuard Rack::OAuth2::Server::Resource::Bearer::Forbidden.new( :insufficient_scope, Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope], - { :scope => e.scopes}) + { scope: e.scopes}) end response.finish @@ -172,4 +172,4 @@ module APIGuard @scopes = scopes end end -end
\ No newline at end of file +end diff --git a/lib/api/entities.rb b/lib/api/entities.rb index ac166ed4fba..58339908fd2 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -55,7 +55,7 @@ module API expose :path, :path_with_namespace expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at expose :namespace - expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } + expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? } end class ProjectMember < UserBasic |