Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
59d0263b
Commit
59d0263b
authored
Oct 03, 2015
by
Guilherme Garnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop warnings in lib
parent
2b075f16
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
9 deletions
+5
-9
lib/api/helpers.rb
lib/api/helpers.rb
+2
-3
lib/event_filter.rb
lib/event_filter.rb
+1
-1
lib/gitlab/contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+0
-1
lib/gitlab/diff/parser.rb
lib/gitlab/diff/parser.rb
+0
-2
lib/gitlab/fogbugz_import/project_creator.rb
lib/gitlab/fogbugz_import/project_creator.rb
+1
-1
lib/gitlab/google_code_import/project_creator.rb
lib/gitlab/google_code_import/project_creator.rb
+1
-1
No files found.
lib/api/helpers.rb
View file @
59d0263b
...
@@ -63,11 +63,11 @@ module API
...
@@ -63,11 +63,11 @@ module API
user_project
.
build_missing_services
user_project
.
build_missing_services
service_method
=
"
#{
underscored_service
}
_service"
service_method
=
"
#{
underscored_service
}
_service"
send_service
(
service_method
)
send_service
(
service_method
)
end
end
end
end
@project_service
||
not_found!
(
"Service"
)
@project_service
||
not_found!
(
"Service"
)
end
end
...
@@ -149,7 +149,6 @@ module API
...
@@ -149,7 +149,6 @@ module API
end
end
def
attributes_for_keys
(
keys
,
custom_params
=
nil
)
def
attributes_for_keys
(
keys
,
custom_params
=
nil
)
params_hash
=
custom_params
||
params
attrs
=
{}
attrs
=
{}
keys
.
each
do
|
key
|
keys
.
each
do
|
key
|
if
params
[
key
].
present?
or
(
params
.
has_key?
(
key
)
and
params
[
key
]
==
false
)
if
params
[
key
].
present?
or
(
params
.
has_key?
(
key
)
and
params
[
key
]
==
false
)
...
...
lib/event_filter.rb
View file @
59d0263b
...
@@ -47,7 +47,7 @@ class EventFilter
...
@@ -47,7 +47,7 @@ class EventFilter
actions
<<
Event
::
COMMENTED
if
filter
.
include?
'comments'
actions
<<
Event
::
COMMENTED
if
filter
.
include?
'comments'
events
=
events
.
where
(
action:
actions
)
events
.
where
(
action:
actions
)
end
end
def
options
(
key
)
def
options
(
key
)
...
...
lib/gitlab/contributions_calendar.rb
View file @
59d0263b
...
@@ -12,7 +12,6 @@ module Gitlab
...
@@ -12,7 +12,6 @@ module Gitlab
@timestamps
=
{}
@timestamps
=
{}
date_from
=
1
.
year
.
ago
date_from
=
1
.
year
.
ago
date_to
=
Date
.
today
events
=
Event
.
reorder
(
nil
).
contributions
.
where
(
author_id:
user
.
id
).
events
=
Event
.
reorder
(
nil
).
contributions
.
where
(
author_id:
user
.
id
).
where
(
"created_at > ?"
,
date_from
).
where
(
project_id:
projects
).
where
(
"created_at > ?"
,
date_from
).
where
(
project_id:
projects
).
...
...
lib/gitlab/diff/parser.rb
View file @
59d0263b
...
@@ -14,8 +14,6 @@ module Gitlab
...
@@ -14,8 +14,6 @@ module Gitlab
lines_arr
=
::
Gitlab
::
InlineDiff
.
processing
lines
lines_arr
=
::
Gitlab
::
InlineDiff
.
processing
lines
lines_arr
.
each
do
|
line
|
lines_arr
.
each
do
|
line
|
raw_line
=
line
.
dup
next
if
filename?
(
line
)
next
if
filename?
(
line
)
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
...
...
lib/gitlab/fogbugz_import/project_creator.rb
View file @
59d0263b
...
@@ -23,7 +23,7 @@ module Gitlab
...
@@ -23,7 +23,7 @@ module Gitlab
import_url:
Project
::
UNKNOWN_IMPORT_URL
import_url:
Project
::
UNKNOWN_IMPORT_URL
).
execute
).
execute
import_data
=
project
.
create_import_data
(
project
.
create_import_data
(
data:
{
data:
{
'repo'
=>
repo
.
raw_data
,
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
,
'user_map'
=>
user_map
,
...
...
lib/gitlab/google_code_import/project_creator.rb
View file @
59d0263b
...
@@ -23,7 +23,7 @@ module Gitlab
...
@@ -23,7 +23,7 @@ module Gitlab
import_url:
repo
.
import_url
import_url:
repo
.
import_url
).
execute
).
execute
import_data
=
project
.
create_import_data
(
project
.
create_import_data
(
data:
{
data:
{
"repo"
=>
repo
.
raw_data
,
"repo"
=>
repo
.
raw_data
,
"user_map"
=>
user_map
"user_map"
=>
user_map
...
...
Write
Preview
Markdown
is supported
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