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
879f3a6d6920
Commit
879f3a6d
authored
Feb 22, 2017
by
Douwe Maan
Browse files
Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
parent
92a4261b3e25
Changes
466
Hide whitespace changes
Inline
Side-by-side
.rubocop.yml
View file @
879f3a6d
...
...
@@ -166,7 +166,7 @@
# This cop checks the . position in multi-line method calls.
Style/DotPosition
:
Enabled
:
true
EnforcedStyle
:
lead
ing
EnforcedStyle
:
trail
ing
# This cop checks for uses of double negation (!!) to convert something
# to a boolean value. As this is both cryptic and usually redundant, it
...
...
app/controllers/admin/application_settings_controller.rb
View file @
879f3a6d
...
...
@@ -5,9 +5,9 @@
end
def
update
successful
=
ApplicationSettings
::
UpdateService
.
new
(
@application_setting
,
current_user
,
application_setting_params
)
.
execute
successful
=
ApplicationSettings
::
UpdateService
.
new
(
@application_setting
,
current_user
,
application_setting_params
)
.
execute
if
successful
redirect_to
admin_application_settings_path
,
...
...
app/controllers/concerns/creates_commit.rb
View file @
879f3a6d
...
...
@@ -83,8 +83,8 @@
def
merge_request_exists?
return
@merge_request
if
defined?
(
@merge_request
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@mr_target_project
.
id
).
execute
.
opened
.
find_by
(
source_branch:
@mr_source_branch
,
target_branch:
@mr_target_branch
,
source_project_id:
@mr_source_project
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@mr_target_project
.
id
).
execute
.
opened
.
find_by
(
source_branch:
@mr_source_branch
,
target_branch:
@mr_target_branch
,
source_project_id:
@mr_source_project
)
end
def
different_project?
...
...
app/controllers/concerns/issues_action.rb
View file @
879f3a6d
...
...
@@ -5,9 +5,9 @@
def
issues
@label
=
issues_finder
.
labels
.
first
@issues
=
issues_collection
.
non_archived
.
page
(
params
[
:page
])
@issues
=
issues_collection
.
non_archived
.
page
(
params
[
:page
])
@collection_type
=
"Issue"
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
...
...
app/controllers/concerns/membership_actions.rb
View file @
879f3a6d
...
...
@@ -15,8 +15,8 @@
end
def
leave
member
=
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
user_id:
current_user
.
id
)
.
execute
(
:all
)
member
=
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
user_id:
current_user
.
id
)
.
execute
(
:all
)
source_type
=
membershipable
.
class
.
to_s
.
humanize
(
capitalize:
false
)
notice
=
...
...
app/controllers/concerns/merge_requests_action.rb
View file @
879f3a6d
...
...
@@ -5,8 +5,8 @@
def
merge_requests
@label
=
merge_requests_finder
.
labels
.
first
@merge_requests
=
merge_requests_collection
.
page
(
params
[
:page
])
@merge_requests
=
merge_requests_collection
.
page
(
params
[
:page
])
@collection_type
=
"MergeRequest"
@issuable_meta_data
=
issuable_meta_data
(
@merge_requests
,
@collection_type
)
...
...
app/controllers/import/bitbucket_controller.rb
View file @
879f3a6d
...
...
@@ -29,9 +29,9 @@
end
def
jobs
render
json:
current_user
.
created_projects
.
where
(
import_type:
'bitbucket'
)
.
to_json
(
only:
[
:id
,
:import_status
])
render
json:
current_user
.
created_projects
.
where
(
import_type:
'bitbucket'
)
.
to_json
(
only:
[
:id
,
:import_status
])
end
def
create
...
...
app/controllers/jwt_controller.rb
View file @
879f3a6d
...
...
@@ -11,8 +11,8 @@
service
=
SERVICES
[
params
[
:service
]]
return
head
:not_found
unless
service
result
=
service
.
new
(
@authentication_result
.
project
,
@authentication_result
.
actor
,
auth_params
)
.
execute
(
authentication_abilities:
@authentication_result
.
authentication_abilities
)
result
=
service
.
new
(
@authentication_result
.
project
,
@authentication_result
.
actor
,
auth_params
)
.
execute
(
authentication_abilities:
@authentication_result
.
authentication_abilities
)
render
json:
result
,
status:
result
[
:http_status
]
end
...
...
app/controllers/omniauth_callbacks_controller.rb
View file @
879f3a6d
...
...
@@ -144,7 +144,7 @@
end
def
log_audit_event
(
user
,
options
=
{})
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
end
end
app/controllers/profiles_controller.rb
View file @
879f3a6d
...
...
@@ -41,9 +41,9 @@
end
def
audit_log
@events
=
AuditEvent
.
where
(
entity_type:
"User"
,
entity_id:
current_user
.
id
)
.
order
(
"created_at DESC"
)
.
page
(
params
[
:page
])
@events
=
AuditEvent
.
where
(
entity_type:
"User"
,
entity_id:
current_user
.
id
)
.
order
(
"created_at DESC"
)
.
page
(
params
[
:page
])
end
def
update_username
...
...
app/controllers/projects/badges_controller.rb
View file @
879f3a6d
...
...
@@ -4,10 +4,10 @@
before_action
:no_cache_headers
,
except:
[
:index
]
def
build
build_status
=
Gitlab
::
Badge
::
Build
::
Status
.
new
(
project
,
params
[
:ref
])
build_status
=
Gitlab
::
Badge
::
Build
::
Status
.
new
(
project
,
params
[
:ref
])
render_badge
build_status
end
def
coverage
...
...
@@ -9,10 +9,10 @@
render_badge
build_status
end
def
coverage
coverage_report
=
Gitlab
::
Badge
::
Coverage
::
Report
.
new
(
project
,
params
[
:ref
],
params
[
:job
])
coverage_report
=
Gitlab
::
Badge
::
Coverage
::
Report
.
new
(
project
,
params
[
:ref
],
params
[
:job
])
render_badge
coverage_report
end
...
...
app/controllers/projects/blob_controller.rb
View file @
879f3a6d
...
...
@@ -164,7 +164,7 @@
end
def
set_last_commit_sha
@last_commit_sha
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@repository
,
@ref
,
@path
).
sha
@last_commit_sha
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@repository
,
@ref
,
@path
).
sha
end
end
app/controllers/projects/boards/issues_controller.rb
View file @
879f3a6d
...
...
@@ -40,10 +40,10 @@
def
issue
@issue
||=
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
where
(
iid:
params
[
:id
])
.
first!
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
where
(
iid:
params
[
:id
])
.
first!
end
def
authorize_read_issue!
...
...
app/controllers/projects/branches_controller.rb
View file @
879f3a6d
...
...
@@ -32,8 +32,8 @@
branch_name
=
sanitize
(
strip_tags
(
params
[
:branch_name
]))
branch_name
=
Addressable
::
URI
.
unescape
(
branch_name
)
result
=
CreateBranchService
.
new
(
project
,
current_user
)
.
execute
(
branch_name
,
ref
)
result
=
CreateBranchService
.
new
(
project
,
current_user
)
.
execute
(
branch_name
,
ref
)
if
params
[
:issue_iid
]
issue
=
IssuesFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
find_by
(
iid:
params
[
:issue_iid
])
...
...
app/controllers/projects/builds_controller.rb
View file @
879f3a6d
...
...
@@ -48,8 +48,8 @@
respond_to
do
|
format
|
format
.
json
do
state
=
params
[
:state
].
presence
render
json:
@build
.
trace_with_state
(
state:
state
)
.
merge!
(
id:
@build
.
id
,
status:
@build
.
status
)
render
json:
@build
.
trace_with_state
(
state:
state
)
.
merge!
(
id:
@build
.
id
,
status:
@build
.
status
)
end
end
end
...
...
app/controllers/projects/commit_controller.rb
View file @
879f3a6d
...
...
@@ -35,9 +35,9 @@
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
end
end
end
...
...
app/controllers/projects/commits_controller.rb
View file @
879f3a6d
...
...
@@ -18,6 +18,6 @@
@repository
.
commits
(
@ref
,
path:
@path
,
limit:
@limit
,
offset:
@offset
)
end
@note_counts
=
project
.
notes
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@note_counts
=
project
.
notes
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
...
...
@@ -23,6 +23,6 @@
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@ref
,
target_branch:
@repository
.
root_ref
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@ref
,
target_branch:
@repository
.
root_ref
)
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/projects/compare_controller.rb
View file @
879f3a6d
...
...
@@ -46,8 +46,8 @@
end
def
define_diff_vars
@compare
=
CompareService
.
new
(
@project
,
@head_ref
)
.
execute
(
@project
,
@start_ref
)
@compare
=
CompareService
.
new
(
@project
,
@head_ref
)
.
execute
(
@project
,
@start_ref
)
if
@compare
@commits
=
@compare
.
commits
...
...
@@ -66,7 +66,7 @@
end
def
merge_request
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
end
end
app/controllers/projects/environments_controller.rb
View file @
879f3a6d
...
...
@@ -9,10 +9,10 @@
before_action
:verify_api_request!
,
only: :terminal_websocket_authorize
def
index
@environments
=
project
.
environments
.
with_state
(
params
[
:scope
]
||
:available
)
@environments
=
project
.
environments
.
with_state
(
params
[
:scope
]
||
:available
)
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
...
...
@@ -14,13 +14,13 @@
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
within_folders
.
represent
(
@environments
),
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
within_folders
.
represent
(
@environments
),
available_count:
project
.
environments
.
available
.
count
,
stopped_count:
project
.
environments
.
stopped
.
count
}
...
...
@@ -36,10 +36,10 @@
format
.
html
format
.
json
do
render
json:
{
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@environments
),
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@environments
),
available_count:
folder_environments
.
available
.
count
,
stopped_count:
folder_environments
.
stopped
.
count
}
...
...
app/controllers/projects/issues_controller.rb
View file @
879f3a6d
...
...
@@ -77,8 +77,8 @@
def
show
raw_notes
=
@issue
.
notes
.
inc_relations_for_view
.
fresh
@notes
=
Banzai
::
NoteRenderer
.
render
(
raw_notes
,
@project
,
current_user
,
@path
,
@project_wiki
,
@ref
)
@notes
=
Banzai
::
NoteRenderer
.
render
(
raw_notes
,
@project
,
current_user
,
@path
,
@project_wiki
,
@ref
)
@note
=
@project
.
notes
.
new
(
noteable:
@issue
)
@noteable
=
@issue
...
...
@@ -189,9 +189,9 @@
def
merge_request_for_resolving_discussions
return
unless
merge_request_iid
=
params
[
:merge_request_for_resolving_discussions
]
@merge_request_for_resolving_discussions
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
find_by
(
iid:
merge_request_iid
)
@merge_request_for_resolving_discussions
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
find_by
(
iid:
merge_request_iid
)
end
def
authorize_read_issue!
...
...
Prev
1
2
3
4
5
…
24
Next
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