Fully embrace Ruby 1.9 hash syntax

Didn't bother with files in db/, config/, or features/

9 files changed, 48 insertions, 48 deletions

diff --git a/lib/api.rb b/lib/api.rb
index 6a8a3d651c0..3ff3b3836f4 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
 module Gitlab
   class API < Grape::API
     VERSION = 'v2'
-    version VERSION, :using => :path
+    version VERSION, using: :path
 
     rescue_from ActiveRecord::RecordNotFound do
       rack_response({'message' => '404 Not found'}.to_json, 404)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d86fb79c78b..96ccd87a407 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -11,8 +11,8 @@ module Gitlab
 
     class Project < Grape::Entity
       expose :id, :code, :name, :description, :path, :default_branch
-      expose :owner, :using => Entities::UserBasic
-      expose :private_flag, :as => :private
+      expose :owner, using: Entities::UserBasic
+      expose :private_flag, as: :private
       expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at
     end
 
@@ -22,7 +22,7 @@ module Gitlab
 
     class ProjectSnippet < Grape::Entity
       expose :id, :title, :file_name
-      expose :author, :using => Entities::UserBasic
+      expose :author, using: Entities::UserBasic
       expose :expires_at, :updated_at, :created_at
     end
 
@@ -34,9 +34,9 @@ module Gitlab
       expose :id
       expose (:project_id) {|issue| issue.project.id}
       expose :title, :description
-      expose :label_list, :as => :labels
-      expose :milestone, :using => Entities::Milestone
-      expose :assignee, :author, :using => Entities::UserBasic
+      expose :label_list, as: :labels
+      expose :milestone, using: Entities::Milestone
+      expose :assignee, :author, using: Entities::UserBasic
       expose :closed, :updated_at, :created_at
     end
   end
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index dcb6e53588c..2abc20ad34e 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -9,7 +9,7 @@ module Gitlab
       # Example Request:
       #   GET /issues
       get do
-        present current_user.issues, :with => Entities::Issue
+        present current_user.issues, with: Entities::Issue
       end
     end
 
@@ -21,7 +21,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/issues
       get ":id/issues" do
-        present user_project.issues, :with => Entities::Issue
+        present user_project.issues, with: Entities::Issue
       end
 
       # Get a single project issue
@@ -33,7 +33,7 @@ module Gitlab
       #   GET /projects/:id/issues/:issue_id
       get ":id/issues/:issue_id" do
         @issue = user_project.issues.find(params[:issue_id])
-        present @issue, :with => Entities::Issue
+        present @issue, with: Entities::Issue
       end
 
       # Create a new project issue
@@ -49,16 +49,16 @@ module Gitlab
       #   POST /projects/:id/issues
       post ":id/issues" do
         @issue = user_project.issues.new(
-          :title        => params[:title],
-          :description  => params[:description],
-          :assignee_id  => params[:assignee_id],
-          :milestone_id => params[:milestone_id],
-          :label_list   => params[:labels]
+          title: params[:title],
+          description: params[:description],
+          assignee_id: params[:assignee_id],
+          milestone_id: params[:milestone_id],
+          label_list: params[:labels]
         )
         @issue.author = current_user
 
         if @issue.save
-          present @issue, :with => Entities::Issue
+          present @issue, with: Entities::Issue
         else
           error!({'message' => '404 Not found'}, 404)
         end
@@ -80,16 +80,16 @@ module Gitlab
       put ":id/issues/:issue_id" do
         @issue = user_project.issues.find(params[:issue_id])
         parameters = {
-          :title        => (params[:title] || @issue.title),
-          :description  => (params[:description] || @issue.description),
-          :assignee_id  => (params[:assignee_id] || @issue.assignee_id),
-          :milestone_id => (params[:milestone_id] || @issue.milestone_id),
-          :label_list   => (params[:labels] || @issue.label_list),
-          :closed       => (params[:closed] || @issue.closed)
+          title: (params[:title] || @issue.title),
+          description: (params[:description] || @issue.description),
+          assignee_id: (params[:assignee_id] || @issue.assignee_id),
+          milestone_id: (params[:milestone_id] || @issue.milestone_id),
+          label_list: (params[:labels] || @issue.label_list),
+          closed: (params[:closed] || @issue.closed)
         }
 
         if @issue.update_attributes(parameters)
-          present @issue, :with => Entities::Issue
+          present @issue, with: Entities::Issue
         else
           error!({'message' => '404 Not found'}, 404)
         end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 31bc7d88ea0..eb23641c605 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -10,7 +10,7 @@ module Gitlab
       #   GET /projects
       get do
         @projects = current_user.projects
-        present @projects, :with => Entities::Project
+        present @projects, with: Entities::Project
       end
 
       # Get a single project
@@ -20,7 +20,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id
       get ":id" do
-        present user_project, :with => Entities::Project
+        present user_project, with: Entities::Project
       end
 
       # Get a project repository branches
@@ -30,7 +30,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/repository/branches
       get ":id/repository/branches" do
-        present user_project.repo.heads.sort_by(&:name), :with => Entities::RepoObject
+        present user_project.repo.heads.sort_by(&:name), with: Entities::RepoObject
       end
 
       # Get a single branch
@@ -42,7 +42,7 @@ module Gitlab
       #   GET /projects/:id/repository/branches/:branch
       get ":id/repository/branches/:branch" do
         @branch = user_project.repo.heads.find { |item| item.name == params[:branch] }
-        present @branch, :with => Entities::RepoObject
+        present @branch, with: Entities::RepoObject
       end
 
       # Get a project repository tags
@@ -52,7 +52,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/repository/tags
       get ":id/repository/tags" do
-        present user_project.repo.tags.sort_by(&:name).reverse, :with => Entities::RepoObject
+        present user_project.repo.tags.sort_by(&:name).reverse, with: Entities::RepoObject
       end
 
       # Get a project snippet
@@ -64,7 +64,7 @@ module Gitlab
       #   GET /projects/:id/snippets/:snippet_id
       get ":id/snippets/:snippet_id" do
         @snippet = user_project.snippets.find(params[:snippet_id])
-        present @snippet, :with => Entities::ProjectSnippet
+        present @snippet, with: Entities::ProjectSnippet
       end
 
       # Create a new project snippet
@@ -79,15 +79,15 @@ module Gitlab
       #   POST /projects/:id/snippets
       post ":id/snippets" do
         @snippet = user_project.snippets.new(
-          :title      => params[:title],
-          :file_name  => params[:file_name],
-          :expires_at => params[:lifetime],
-          :content    => params[:code]
+          title: params[:title],
+          file_name: params[:file_name],
+          expires_at: params[:lifetime],
+          content: params[:code]
         )
         @snippet.author = current_user
 
         if @snippet.save
-          present @snippet, :with => Entities::ProjectSnippet
+          present @snippet, with: Entities::ProjectSnippet
         else
           error!({'message' => '404 Not found'}, 404)
         end
@@ -107,14 +107,14 @@ module Gitlab
       put ":id/snippets/:snippet_id" do
         @snippet = user_project.snippets.find(params[:snippet_id])
         parameters = {
-          :title      => (params[:title] || @snippet.title),
-          :file_name  => (params[:file_name] || @snippet.file_name),
-          :expires_at => (params[:lifetime] || @snippet.expires_at),
-          :content    => (params[:code] || @snippet.content)
+          title: (params[:title] || @snippet.title),
+          file_name: (params[:file_name] || @snippet.file_name),
+          expires_at: (params[:lifetime] || @snippet.expires_at),
+          content: (params[:code] || @snippet.content)
         }
 
         if @snippet.update_attributes(parameters)
-          present @snippet, :with => Entities::ProjectSnippet
+          present @snippet, with: Entities::ProjectSnippet
         else
           error!({'message' => '404 Not found'}, 404)
         end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index ef3762f30fc..81cb2a0e684 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -10,7 +10,7 @@ module Gitlab
       #  GET /users
       get do
         @users = User.all
-        present @users, :with => Entities::User
+        present @users, with: Entities::User
       end
 
       # Get a single user
@@ -21,7 +21,7 @@ module Gitlab
       #   GET /users/:id
       get ":id" do
         @user = User.find(params[:id])
-        present @user, :with => Entities::User
+        present @user, with: Entities::User
       end
     end
 
@@ -30,7 +30,7 @@ module Gitlab
     # Example Request:
     #   GET /user
     get "/user" do
-      present @current_user, :with => Entities::User
+      present @current_user, with: Entities::User
     end
   end
 end
diff --git a/lib/file_size_validator.rb b/lib/file_size_validator.rb
index 611e584f14f..42970c1be59 100644
--- a/lib/file_size_validator.rb
+++ b/lib/file_size_validator.rb
@@ -1,6 +1,6 @@
 class FileSizeValidator < ActiveModel::EachValidator
-  MESSAGES  = { :is => :wrong_size, :minimum => :size_too_small, :maximum => :size_too_big }.freeze
-  CHECKS    = { :is => :==, :minimum => :>=, :maximum => :<= }.freeze
+  MESSAGES  = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
+  CHECKS    = { is: :==, minimum: :>=, maximum: :<= }.freeze
 
   DEFAULT_TOKENIZER = lambda { |value| value.split(//) }
   RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long]
diff --git a/lib/gitlab/encode.rb b/lib/gitlab/encode.rb
index 0787434b3af..7e37442ea32 100644
--- a/lib/gitlab/encode.rb
+++ b/lib/gitlab/encode.rb
@@ -19,7 +19,7 @@ module Gitlab
       # if message is not utf-8 encoding, convert it
       if detect[:encoding]
         message.force_encoding(detect[:encoding])
-        message.encode!("utf-8", detect[:encoding], :undef => :replace, :replace => "", :invalid => :replace)
+        message.encode!("utf-8", detect[:encoding], undef: :replace, replace: "", invalid: :replace)
       end
 
       # ensure message encoding is utf8
diff --git a/lib/graph_commit.rb b/lib/graph_commit.rb
index 269378e8acc..e08a8fad4c1 100644
--- a/lib/graph_commit.rb
+++ b/lib/graph_commit.rb
@@ -6,7 +6,7 @@ class GraphCommit
 
   def self.to_graph(project)
     @repo = project.repo
-    commits = Grit::Commit.find_all(@repo, nil, {:max_count => 650})
+    commits = Grit::Commit.find_all(@repo, nil, {max_count: 650})
 
     ref_cache = {}
 
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 33403dedbd8..30a807145ea 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -11,9 +11,9 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
 
   def block_code(code, language)
     if Pygments::Lexer.find(language)
-      Pygments.highlight(code, :lexer => language, :options => {:encoding => 'utf-8'})
+      Pygments.highlight(code, lexer: language, options: {encoding: 'utf-8'})
     else
-      Pygments.highlight(code, :options => {:encoding => 'utf-8'})
+      Pygments.highlight(code, options: {encoding: 'utf-8'})
     end
   end