From 4f1d1fc51baf396d49f6b159c84e15194706847c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 19:30:09 -0800
Subject: Convert hashes to ruby 1.9 style

---
 lib/api/api_guard.rb          | 4 ++--
 lib/api/entities.rb           | 2 +-
 lib/gitlab/github/importer.rb | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

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
diff --git a/lib/gitlab/github/importer.rb b/lib/gitlab/github/importer.rb
index c72a1c25e9e..9f0fc6c4471 100644
--- a/lib/gitlab/github/importer.rb
+++ b/lib/gitlab/github/importer.rb
@@ -9,12 +9,12 @@ module Gitlab
 
       def execute
         client = octo_client(project.creator.github_access_token)
-       
+
         #Issues && Comments
         client.list_issues(project.import_source, state: :all).each do |issue|
           if issue.pull_request.nil?
             body = "*Created by: #{issue.user.login}*\n\n#{issue.body}"
-            
+
             if issue.comments > 0
               body += "\n\n\n**Imported comments:**\n"
               client.issue_comments(project.import_source, issue.number).each do |c|
@@ -23,7 +23,7 @@ module Gitlab
             end
 
             project.issues.create!(
-              description: body, 
+              description: body,
               title: issue.title,
               state: issue.state == 'closed' ? 'closed' : 'opened',
               author_id: gl_user_id(project, issue.user.id)
@@ -36,7 +36,7 @@ module Gitlab
 
       def octo_client(access_token)
         ::Octokit.auto_paginate = true
-        ::Octokit::Client.new(:access_token => access_token)
+        ::Octokit::Client.new(access_token: access_token)
       end
 
       def gl_user_id(project, github_id)
-- 
cgit v1.2.1