Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
85631149f775
Commit
5a4ebfb4
authored
Apr 16, 2015
by
Jeroen van Baarsen
Browse files
Fixed the Rails/ActionFilter cop
Signed-off-by:
Jeroen van Baarsen
<
jeroenvanbaarsen@gmail.com
>
parent
eb87bbc254b0
Changes
66
Hide whitespace changes
Inline
Side-by-side
.rubocop.yml
View file @
85631149
...
...
@@ -954,7 +954,7 @@ Lint/Void:
Rails/ActionFilter
:
Description
:
'
Enforces
consistent
use
of
action
filter
methods.'
Enabled
:
fals
e
Enabled
:
tru
e
Rails/DefaultScope
:
Description
:
'
Checks
if
the
argument
passed
to
default_scope
is
a
block.'
...
...
app/controllers/admin/application_controller.rb
View file @
85631149
...
...
@@ -3,7 +3,7 @@
# Automatically sets the layout and ensures an administrator is logged in
class
Admin::ApplicationController
<
ApplicationController
layout
'admin'
before_
filter
:authenticate_admin!
before_
action
:authenticate_admin!
def
authenticate_admin!
return
render_404
unless
current_user
.
is_admin?
...
...
app/controllers/admin/application_settings_controller.rb
View file @
85631149
class
Admin::ApplicationSettingsController
<
Admin
::
ApplicationController
before_
filter
:set_application_setting
before_
action
:set_application_setting
def
show
end
...
...
app/controllers/admin/broadcast_messages_controller.rb
View file @
85631149
class
Admin::BroadcastMessagesController
<
Admin
::
ApplicationController
before_
filter
:broadcast_messages
before_
action
:broadcast_messages
def
index
@broadcast_message
=
BroadcastMessage
.
new
...
...
app/controllers/admin/deploy_keys_controller.rb
View file @
85631149
class
Admin::DeployKeysController
<
Admin
::
ApplicationController
before_
filter
:deploy_keys
,
only:
[
:index
]
before_
filter
:deploy_key
,
only:
[
:show
,
:destroy
]
before_
action
:deploy_keys
,
only:
[
:index
]
before_
action
:deploy_key
,
only:
[
:show
,
:destroy
]
def
index
end
def
show
end
def
new
...
...
app/controllers/admin/groups_controller.rb
View file @
85631149
class
Admin::GroupsController
<
Admin
::
ApplicationController
before_
filter
:group
,
only:
[
:edit
,
:show
,
:update
,
:destroy
,
:project_update
,
:members_update
]
before_
action
:group
,
only:
[
:edit
,
:show
,
:update
,
:destroy
,
:project_update
,
:members_update
]
def
index
@groups
=
Group
.
all
...
...
app/controllers/admin/keys_controller.rb
View file @
85631149
class
Admin::KeysController
<
Admin
::
ApplicationController
before_
filter
:user
,
only:
[
:show
,
:destroy
]
before_
action
:user
,
only:
[
:show
,
:destroy
]
def
show
@key
=
user
.
keys
.
find
(
params
[
:id
])
...
...
app/controllers/admin/projects_controller.rb
View file @
85631149
class
Admin::ProjectsController
<
Admin
::
ApplicationController
before_
filter
:project
,
only:
[
:show
,
:transfer
]
before_
filter
:group
,
only:
[
:show
,
:transfer
]
before_
filter
:repository
,
only:
[
:show
,
:transfer
]
before_
action
:project
,
only:
[
:show
,
:transfer
]
before_
action
:group
,
only:
[
:show
,
:transfer
]
before_
action
:repository
,
only:
[
:show
,
:transfer
]
def
index
@projects
=
Project
.
all
...
...
app/controllers/admin/services_controller.rb
View file @
85631149
class
Admin::ServicesController
<
Admin
::
ApplicationController
before_
filter
:service
,
only:
[
:edit
,
:update
]
before_
action
:service
,
only:
[
:edit
,
:update
]
def
index
@services
=
services_templates
...
...
app/controllers/admin/users_controller.rb
View file @
85631149
class
Admin::UsersController
<
Admin
::
ApplicationController
before_
filter
:user
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
before_
action
:user
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
def
index
@users
=
User
.
order_name_asc
.
filter
(
params
[
:filter
])
...
...
app/controllers/application_controller.rb
View file @
85631149
...
...
@@ -6,15 +6,15 @@ class ApplicationController < ActionController::Base
PER_PAGE
=
20
before_
filter
:authenticate_user_from_token!
before_
filter
:authenticate_user!
before_
filter
:reject_blocked!
before_
filter
:check_password_expiration
before_
filter
:ldap_security_check
before_
filter
:default_headers
before_
filter
:add_gon_variables
before_
filter
:configure_permitted_parameters
,
if: :devise_controller?
before_
filter
:require_email
,
unless: :devise_controller?
before_
action
:authenticate_user_from_token!
before_
action
:authenticate_user!
before_
action
:reject_blocked!
before_
action
:check_password_expiration
before_
action
:ldap_security_check
before_
action
:default_headers
before_
action
:add_gon_variables
before_
action
:configure_permitted_parameters
,
if: :devise_controller?
before_
action
:require_email
,
unless: :devise_controller?
protect_from_forgery
with: :exception
...
...
app/controllers/dashboard/milestones_controller.rb
View file @
85631149
class
Dashboard::MilestonesController
<
ApplicationController
before_
filter
:load_projects
before_
action
:load_projects
def
index
project_milestones
=
case
params
[
:state
]
...
...
app/controllers/dashboard/projects_controller.rb
View file @
85631149
class
Dashboard::ProjectsController
<
ApplicationController
before_
filter
:event_filter
before_
action
:event_filter
def
starred
@projects
=
current_user
.
starred_projects
...
...
app/controllers/dashboard_controller.rb
View file @
85631149
class
DashboardController
<
ApplicationController
respond_to
:html
before_
filter
:load_projects
,
except:
[
:projects
]
before_
filter
:event_filter
,
only: :show
before_
action
:load_projects
,
except:
[
:projects
]
before_
action
:event_filter
,
only: :show
def
show
@projects
=
@projects
.
includes
(
:namespace
)
...
...
app/controllers/explore/groups_controller.rb
View file @
85631149
class
Explore::GroupsController
<
ApplicationController
skip_before_
filter
:authenticate_user!
,
skip_before_
action
:authenticate_user!
,
:reject_blocked
,
:set_current_user_for_observers
layout
"explore"
...
...
app/controllers/explore/projects_controller.rb
View file @
85631149
class
Explore::ProjectsController
<
ApplicationController
skip_before_
filter
:authenticate_user!
,
skip_before_
action
:authenticate_user!
,
:reject_blocked
layout
'explore'
...
...
app/controllers/groups/group_members_controller.rb
View file @
85631149
class
Groups::GroupMembersController
<
Groups
::
ApplicationController
skip_before_
filter
:authenticate_user!
,
only:
[
:index
]
before_
filter
:group
skip_before_
action
:authenticate_user!
,
only:
[
:index
]
before_
action
:group
# Authorize
before_
filter
:authorize_read_group!
before_
filter
:authorize_admin_group!
,
except:
[
:index
,
:leave
]
before_
action
:authorize_read_group!
before_
action
:authorize_admin_group!
,
except:
[
:index
,
:leave
]
layout
:determine_layout
...
...
@@ -49,7 +49,7 @@ def destroy
def
resend_invite
redirect_path
=
group_group_members_path
(
@group
)
@group_member
=
@group
.
group_members
.
find
(
params
[
:id
])
if
@group_member
.
invite?
...
...
@@ -63,7 +63,7 @@ def resend_invite
def
leave
@group_member
=
@group
.
group_members
.
where
(
user_id:
current_user
.
id
).
first
if
can?
(
current_user
,
:destroy_group_member
,
@group_member
)
@group_member
.
destroy
redirect_to
(
dashboard_groups_path
,
notice:
"You left
#{
group
.
name
}
group."
)
...
...
app/controllers/groups/milestones_controller.rb
View file @
85631149
class
Groups::MilestonesController
<
ApplicationController
layout
'group'
before_
filter
:authorize_group_milestone!
,
only: :update
before_
action
:authorize_group_milestone!
,
only: :update
def
index
project_milestones
=
case
params
[
:state
]
...
...
app/controllers/groups_controller.rb
View file @
85631149
class
GroupsController
<
Groups
::
ApplicationController
skip_before_
filter
:authenticate_user!
,
only:
[
:show
,
:issues
,
:merge_requests
]
skip_before_
action
:authenticate_user!
,
only:
[
:show
,
:issues
,
:merge_requests
]
respond_to
:html
before_
filter
:group
,
except:
[
:new
,
:create
]
before_
action
:group
,
except:
[
:new
,
:create
]
# Authorize
before_
filter
:authorize_read_group!
,
except:
[
:new
,
:create
]
before_
filter
:authorize_admin_group!
,
only:
[
:edit
,
:update
,
:destroy
,
:projects
]
before_
filter
:authorize_create_group!
,
only:
[
:new
,
:create
]
before_
action
:authorize_read_group!
,
except:
[
:new
,
:create
]
before_
action
:authorize_admin_group!
,
only:
[
:edit
,
:update
,
:destroy
,
:projects
]
before_
action
:authorize_create_group!
,
only:
[
:new
,
:create
]
# Load group projects
before_
filter
:load_projects
,
except:
[
:new
,
:create
,
:projects
,
:edit
,
:update
]
before_
filter
:event_filter
,
only: :show
before_
filter
:set_title
,
only:
[
:new
,
:create
]
before_
action
:load_projects
,
except:
[
:new
,
:create
,
:projects
,
:edit
,
:update
]
before_
action
:event_filter
,
only: :show
before_
action
:set_title
,
only:
[
:new
,
:create
]
layout
:determine_layout
...
...
app/controllers/import/bitbucket_controller.rb
View file @
85631149
class
Import::BitbucketController
<
Import
::
BaseController
before_
filter
:verify_bitbucket_import_enabled
before_
filter
:bitbucket_auth
,
except: :callback
before_
action
:verify_bitbucket_import_enabled
before_
action
:bitbucket_auth
,
except: :callback
rescue_from
OAuth
::
Error
,
with: :bitbucket_unauthorized
def
callback
request_token
=
session
.
delete
(
:oauth_request_token
)
request_token
=
session
.
delete
(
:oauth_request_token
)
raise
"Session expired!"
if
request_token
.
nil?
request_token
.
symbolize_keys!
access_token
=
client
.
get_token
(
request_token
,
params
[
:oauth_verifier
],
callback_import_bitbucket_url
)
current_user
.
bitbucket_access_token
=
access_token
.
token
...
...
@@ -21,7 +21,7 @@ def callback
def
status
@repos
=
client
.
projects
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"bitbucket"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
...
...
@@ -41,7 +41,7 @@ def create
repo_owner
=
repo
[
"owner"
]
repo_owner
=
current_user
.
username
if
repo_owner
==
client
.
user
[
"user"
][
"username"
]
@target_namespace
=
params
[
:new_namespace
].
presence
||
repo_owner
namespace
=
get_or_create_namespace
||
(
render
and
return
)
unless
Gitlab
::
BitbucketImport
::
KeyAdder
.
new
(
repo
,
current_user
).
execute
...
...
Prev
1
2
3
4
Next
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