Commit 832b63b5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Ruby hash 1.9 with rubycop check

See merge request !1460
parents 7dad2663 afb8ecc3
...@@ -267,7 +267,7 @@ Style/HashSyntax: ...@@ -267,7 +267,7 @@ Style/HashSyntax:
Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax
{ :a => 1, :b => 2 }. { :a => 1, :b => 2 }.
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals'
Enabled: false Enabled: true
Style/IfUnlessModifier: Style/IfUnlessModifier:
Description: >- Description: >-
...@@ -817,10 +817,6 @@ Lint/DeprecatedClassMethods: ...@@ -817,10 +817,6 @@ Lint/DeprecatedClassMethods:
Description: 'Check for deprecated class method calls.' Description: 'Check for deprecated class method calls.'
Enabled: false Enabled: false
Lint/DuplicateMethods:
Description: 'Check for duplicate methods calls.'
Enabled: false
Lint/ElseLayout: Lint/ElseLayout:
Description: 'Check for odd code arrangement in an else block.' Description: 'Check for odd code arrangement in an else block.'
Enabled: false Enabled: false
......
...@@ -25,7 +25,7 @@ v 7.8.0 ...@@ -25,7 +25,7 @@ v 7.8.0
- Upgrade Sidekiq gem to version 3.3.0 - Upgrade Sidekiq gem to version 3.3.0
- Stop git zombie creation during force push check - Stop git zombie creation during force push check
- Show success/error messages for test setting button in services - Show success/error messages for test setting button in services
- - Added Rubocop for code style checks
- Fix commits pagination - Fix commits pagination
- -
- -
......
...@@ -23,7 +23,7 @@ class GithubImportsController < ApplicationController ...@@ -23,7 +23,7 @@ class GithubImportsController < ApplicationController
end end
def jobs 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 render json: jobs
end end
...@@ -58,7 +58,7 @@ class GithubImportsController < ApplicationController ...@@ -58,7 +58,7 @@ class GithubImportsController < ApplicationController
def octo_client def octo_client
Octokit.auto_paginate = true 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 end
def github_auth def github_auth
......
...@@ -31,7 +31,7 @@ module EmailsHelper ...@@ -31,7 +31,7 @@ module EmailsHelper
end end
def add_email_highlight_css def add_email_highlight_css
Rugments::Themes::Github.render(:scope => '.highlight') Rugments::Themes::Github.render(scope: '.highlight')
end end
def color_email_diff(diffcontent) def color_email_diff(diffcontent)
......
...@@ -15,11 +15,13 @@ module MergeRequestsHelper ...@@ -15,11 +15,13 @@ module MergeRequestsHelper
end end
def new_mr_from_push_event(event, target_project) def new_mr_from_push_event(event, target_project)
return :merge_request => { return {
source_project_id: event.project.id, merge_request: {
target_project_id: target_project.id, source_project_id: event.project.id,
source_branch: event.branch_name, target_project_id: target_project.id,
target_branch: target_project.repository.root_ref source_branch: event.branch_name,
target_branch: target_project.repository.root_ref
}
} }
end end
......
...@@ -76,7 +76,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -76,7 +76,7 @@ class MergeRequest < ActiveRecord::Base
merge_request.save merge_request.save
end 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.locked_at = nil
merge_request.save merge_request.save
end end
......
...@@ -156,22 +156,22 @@ class Project < ActiveRecord::Base ...@@ -156,22 +156,22 @@ class Project < ActiveRecord::Base
end end
event :import_finish do event :import_finish do
transition :started => :finished transition started: :finished
end end
event :import_fail do event :import_fail do
transition :started => :failed transition started: :failed
end end
event :import_retry do event :import_retry do
transition :failed => :started transition failed: :started
end end
state :started state :started
state :finished state :finished
state :failed state :failed
after_transition any => :started, :do => :add_import_job after_transition any => :started, do: :add_import_job
end end
class << self class << self
......
...@@ -23,11 +23,11 @@ if File.exists?(aws_file) ...@@ -23,11 +23,11 @@ if File.exists?(aws_file)
if Rails.env.test? if Rails.env.test?
Fog.mock! Fog.mock!
connection = ::Fog::Storage.new( connection = ::Fog::Storage.new(
:aws_access_key_id => AWS_CONFIG['access_key_id'], aws_access_key_id: AWS_CONFIG['access_key_id'],
:aws_secret_access_key => AWS_CONFIG['secret_access_key'], aws_secret_access_key: AWS_CONFIG['secret_access_key'],
:provider => 'AWS', provider: 'AWS',
:region => AWS_CONFIG['region'] region: AWS_CONFIG['region']
) )
connection.directories.create(:key => AWS_CONFIG['bucket']) connection.directories.create(key: AWS_CONFIG['bucket'])
end end
end end
...@@ -43,10 +43,10 @@ Doorkeeper.configure do ...@@ -43,10 +43,10 @@ Doorkeeper.configure do
force_ssl_in_redirect_uri false force_ssl_in_redirect_uri false
# Provide support for an owner to be assigned to each registered application (disabled by default) # 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 # a registered application
# Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support # 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 # Define access token scopes for your provider
# For more information go to # For more information go to
......
...@@ -3,9 +3,9 @@ require 'api/api' ...@@ -3,9 +3,9 @@ require 'api/api'
Gitlab::Application.routes.draw do Gitlab::Application.routes.draw do
use_doorkeeper do use_doorkeeper do
controllers :applications => 'oauth/applications', controllers applications: 'oauth/applications',
:authorized_applications => 'oauth/authorized_applications', authorized_applications: 'oauth/authorized_applications',
:authorizations => 'oauth/authorizations' authorizations: 'oauth/authorizations'
end end
# #
# Search # Search
......
...@@ -146,7 +146,7 @@ module APIGuard ...@@ -146,7 +146,7 @@ module APIGuard
Rack::OAuth2::Server::Resource::Bearer::Forbidden.new( Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
:insufficient_scope, :insufficient_scope,
Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope], Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
{ :scope => e.scopes}) { scope: e.scopes})
end end
response.finish response.finish
...@@ -172,4 +172,4 @@ module APIGuard ...@@ -172,4 +172,4 @@ module APIGuard
@scopes = scopes @scopes = scopes
end end
end end
end end
\ No newline at end of file
...@@ -55,7 +55,7 @@ module API ...@@ -55,7 +55,7 @@ module API
expose :path, :path_with_namespace expose :path, :path_with_namespace
expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
expose :namespace 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 end
class ProjectMember < UserBasic class ProjectMember < UserBasic
......
...@@ -9,12 +9,12 @@ module Gitlab ...@@ -9,12 +9,12 @@ module Gitlab
def execute def execute
client = octo_client(project.creator.github_access_token) client = octo_client(project.creator.github_access_token)
#Issues && Comments #Issues && Comments
client.list_issues(project.import_source, state: :all).each do |issue| client.list_issues(project.import_source, state: :all).each do |issue|
if issue.pull_request.nil? if issue.pull_request.nil?
body = "*Created by: #{issue.user.login}*\n\n#{issue.body}" body = "*Created by: #{issue.user.login}*\n\n#{issue.body}"
if issue.comments > 0 if issue.comments > 0
body += "\n\n\n**Imported comments:**\n" body += "\n\n\n**Imported comments:**\n"
client.issue_comments(project.import_source, issue.number).each do |c| client.issue_comments(project.import_source, issue.number).each do |c|
...@@ -23,7 +23,7 @@ module Gitlab ...@@ -23,7 +23,7 @@ module Gitlab
end end
project.issues.create!( project.issues.create!(
description: body, description: body,
title: issue.title, title: issue.title,
state: issue.state == 'closed' ? 'closed' : 'opened', state: issue.state == 'closed' ? 'closed' : 'opened',
author_id: gl_user_id(project, issue.user.id) author_id: gl_user_id(project, issue.user.id)
...@@ -36,7 +36,7 @@ module Gitlab ...@@ -36,7 +36,7 @@ module Gitlab
def octo_client(access_token) def octo_client(access_token)
::Octokit.auto_paginate = true ::Octokit.auto_paginate = true
::Octokit::Client.new(:access_token => access_token) ::Octokit::Client.new(access_token: access_token)
end end
def gl_user_id(project, github_id) def gl_user_id(project, github_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment