Merge branch 'ruby-hash-1-9' into 'master'

Ruby hash 1.9 with rubycop check

See merge request !1460

.rubocop.yml

@@ -267,7 +267,7 @@ Style/HashSyntax:
                  Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax
                  { :a => 1, :b => 2 }.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals'
-  Enabled: false
+  Enabled: true
 
 Style/IfUnlessModifier:
   Description: >-
@@ -817,10 +817,6 @@ Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: false
 
-Lint/DuplicateMethods:
-  Description: 'Check for duplicate methods calls.'
-  Enabled: false
-
 Lint/ElseLayout:
   Description: 'Check for odd code arrangement in an else block.'
   Enabled: false

CHANGELOG

@@ -25,7 +25,7 @@ v 7.8.0
   - Upgrade Sidekiq gem to version 3.3.0
   - Stop git zombie creation during force push check
   - Show success/error messages for test setting button in services
-  - 
+  - Added Rubocop for code style checks
   - Fix commits pagination
   - 
   - 

app/controllers/github_imports_controller.rb

@@ -23,7 +23,7 @@ class GithubImportsController < ApplicationController
   end
 
   def jobs
-    jobs = current_user.created_projects.where(import_type: "github").to_json(:only => [:id, :import_status])
+    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
     render json: jobs
   end
 
@@ -58,7 +58,7 @@ class GithubImportsController < ApplicationController
 
   def octo_client
     Octokit.auto_paginate = true
-    @octo_client ||= Octokit::Client.new(:access_token => current_user.github_access_token)
+    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
   end
 
   def github_auth

app/helpers/emails_helper.rb

@@ -31,7 +31,7 @@ module EmailsHelper
   end
 
   def add_email_highlight_css
-    Rugments::Themes::Github.render(:scope => '.highlight')
+    Rugments::Themes::Github.render(scope: '.highlight')
   end
 
   def color_email_diff(diffcontent)

app/helpers/merge_requests_helper.rb

@@ -15,11 +15,13 @@ module MergeRequestsHelper
   end
 
   def new_mr_from_push_event(event, target_project)
-    return :merge_request => {
-      source_project_id: event.project.id,
-      target_project_id: target_project.id,
-      source_branch: event.branch_name,
-      target_branch: target_project.repository.root_ref
+    return {
+      merge_request: {
+        source_project_id: event.project.id,
+        target_project_id: target_project.id,
+        source_branch: event.branch_name,
+        target_branch: target_project.repository.root_ref
+      }
     }
   end
 

app/models/merge_request.rb

@@ -76,7 +76,7 @@ class MergeRequest < ActiveRecord::Base
       merge_request.save
     end
 
-    after_transition :locked => (any - :locked) do |merge_request, transition|
+    after_transition locked: (any - :locked) do |merge_request, transition|
       merge_request.locked_at = nil
       merge_request.save
     end

app/models/project.rb

@@ -156,22 +156,22 @@ class Project < ActiveRecord::Base
     end
 
     event :import_finish do
-      transition :started => :finished
+      transition started: :finished
     end
 
     event :import_fail do
-      transition :started => :failed
+      transition started: :failed
     end
 
     event :import_retry do
-      transition :failed => :started
+      transition failed: :started
     end
 
     state :started
     state :finished
     state :failed
 
-    after_transition any => :started, :do => :add_import_job
+    after_transition any => :started, do: :add_import_job
   end
 
   class << self

config/initializers/carrierwave.rb

@@ -23,11 +23,11 @@ if File.exists?(aws_file)
   if Rails.env.test?
     Fog.mock!
     connection = ::Fog::Storage.new(
-        :aws_access_key_id      => AWS_CONFIG['access_key_id'],
-        :aws_secret_access_key  => AWS_CONFIG['secret_access_key'],
-        :provider               => 'AWS',
-        :region                 => AWS_CONFIG['region']
+        aws_access_key_id: AWS_CONFIG['access_key_id'],
+        aws_secret_access_key: AWS_CONFIG['secret_access_key'],
+        provider: 'AWS',
+        region: AWS_CONFIG['region']
       )
-    connection.directories.create(:key => AWS_CONFIG['bucket'])
+    connection.directories.create(key: AWS_CONFIG['bucket'])
   end
 end

config/initializers/doorkeeper.rb

@@ -43,10 +43,10 @@ Doorkeeper.configure do
   force_ssl_in_redirect_uri false
 
   # Provide support for an owner to be assigned to each registered application (disabled by default)
-  # Optional parameter :confirmation => true (default false) if you want to enforce ownership of
+  # Optional parameter confirmation: true (default false) if you want to enforce ownership of
   # a registered application
   # Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
-  enable_application_owner :confirmation => false
+  enable_application_owner confirmation: false
 
   # Define access token scopes for your provider
   # For more information go to

config/routes.rb

@@ -3,9 +3,9 @@ require 'api/api'
 
 Gitlab::Application.routes.draw do
   use_doorkeeper do
-    controllers :applications => 'oauth/applications',
-                :authorized_applications => 'oauth/authorized_applications',
-                :authorizations => 'oauth/authorizations'
+    controllers applications: 'oauth/applications',
+                authorized_applications: 'oauth/authorized_applications',
+                authorizations: 'oauth/authorizations'
   end
   #
   # Search

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

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

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)