Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
cd7a4e62d023
Commit
cd7a4e62
authored
Feb 02, 2015
by
Dmitriy Zaporozhets
Browse files
Convert hashes to ruby 1.9 style
parent
19ad7aa8a11f
Changes
12
Hide whitespace changes
Inline
Side-by-side
.rubocop.yml
View file @
cd7a4e62
...
...
@@ -267,7 +267,7 @@
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
:
fals
e
Enabled
:
tru
e
Style/IfUnlessModifier
:
Description
:
>-
...
...
@@ -817,10 +817,6 @@
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
...
...
app/controllers/github_imports_controller.rb
View file @
cd7a4e62
...
...
@@ -23,7 +23,7 @@
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 @@
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
View file @
cd7a4e62
...
...
@@ -31,7 +31,7 @@
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
View file @
cd7a4e62
...
...
@@ -15,7 +15,7 @@
end
def
new_mr_from_push_event
(
event
,
target_project
)
return
:
merge_request
=>
{
return
merge_request
:
{
source_project_id:
event
.
project
.
id
,
target_project_id:
target_project
.
id
,
source_branch:
event
.
branch_name
,
...
...
app/models/merge_request.rb
View file @
cd7a4e62
...
...
@@ -76,7 +76,7 @@
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
View file @
cd7a4e62
...
...
@@ -156,7 +156,7 @@
end
event
:import_finish
do
transition
:
started
=>
:finished
transition
started
:
:finished
end
event
:import_fail
do
...
...
@@ -160,7 +160,7 @@
end
event
:import_fail
do
transition
:
started
=>
:failed
transition
started
:
:failed
end
event
:import_retry
do
...
...
@@ -164,10 +164,10 @@
end
event
:import_retry
do
transition
:
failed
=>
:started
transition
failed
:
:started
end
state
:started
state
:finished
state
:failed
...
...
@@ -168,10 +168,10 @@
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
View file @
cd7a4e62
...
...
@@ -23,8 +23,8 @@
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'
]
)
...
...
@@ -30,4 +30,4 @@
)
connection
.
directories
.
create
(
:
key
=>
AWS_CONFIG
[
'bucket'
])
connection
.
directories
.
create
(
key
:
AWS_CONFIG
[
'bucket'
])
end
end
config/initializers/doorkeeper.rb
View file @
cd7a4e62
...
...
@@ -43,6 +43,6 @@
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
...
...
@@ -47,6 +47,6 @@
# 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
View file @
cd7a4e62
...
...
@@ -3,9 +3,9 @@
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
View file @
cd7a4e62
...
...
@@ -146,7 +146,7 @@
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 @@
@scopes
=
scopes
end
end
end
\ No newline at end of file
end
lib/api/entities.rb
View file @
cd7a4e62
...
...
@@ -55,7 +55,7 @@
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
View file @
cd7a4e62
...
...
@@ -9,8 +9,8 @@
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
}
"
...
...
@@ -13,8 +13,8 @@
#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 @@
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 @@
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment