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
Kazuhiko Shiozaki
gitlab-ce
Commits
b66a1527
Commit
b66a1527
authored
Oct 19, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factor abilities methods
in app controller, user model and services.
parent
3880bb61
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
20 deletions
+13
-20
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-6
app/controllers/explore/groups_controller.rb
app/controllers/explore/groups_controller.rb
+1
-2
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+1
-2
app/models/ability.rb
app/models/ability.rb
+8
-0
app/models/user.rb
app/models/user.rb
+1
-5
app/services/base_service.rb
app/services/base_service.rb
+1
-5
No files found.
app/controllers/application_controller.rb
View file @
b66a1527
...
@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
...
@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
before_filter
:authenticate_user!
before_filter
:authenticate_user!
before_filter
:reject_blocked!
before_filter
:reject_blocked!
before_filter
:check_password_expiration
before_filter
:check_password_expiration
before_filter
:add_abilities
before_filter
:ldap_security_check
before_filter
:ldap_security_check
before_filter
:dev_tools
if
Rails
.
env
==
'development'
before_filter
:dev_tools
if
Rails
.
env
==
'development'
before_filter
:default_headers
before_filter
:default_headers
...
@@ -73,7 +72,7 @@ class ApplicationController < ActionController::Base
...
@@ -73,7 +72,7 @@ class ApplicationController < ActionController::Base
end
end
def
abilities
def
abilities
@abilities
||=
Six
.
new
Ability
.
abilities
end
end
def
can?
(
object
,
action
,
subject
)
def
can?
(
object
,
action
,
subject
)
...
@@ -111,10 +110,6 @@ class ApplicationController < ActionController::Base
...
@@ -111,10 +110,6 @@ class ApplicationController < ActionController::Base
nil
nil
end
end
def
add_abilities
abilities
<<
Ability
end
def
authorize_project!
(
action
)
def
authorize_project!
(
action
)
return
access_denied!
unless
can?
(
current_user
,
action
,
project
)
return
access_denied!
unless
can?
(
current_user
,
action
,
project
)
end
end
...
...
app/controllers/explore/groups_controller.rb
View file @
b66a1527
class
Explore::GroupsController
<
ApplicationController
class
Explore::GroupsController
<
ApplicationController
skip_before_filter
:authenticate_user!
,
skip_before_filter
:authenticate_user!
,
:reject_blocked
,
:set_current_user_for_observers
,
:reject_blocked
,
:set_current_user_for_observers
:add_abilities
layout
"explore"
layout
"explore"
...
...
app/controllers/explore/projects_controller.rb
View file @
b66a1527
class
Explore::ProjectsController
<
ApplicationController
class
Explore::ProjectsController
<
ApplicationController
skip_before_filter
:authenticate_user!
,
skip_before_filter
:authenticate_user!
,
:reject_blocked
,
:reject_blocked
:add_abilities
layout
'explore'
layout
'explore'
...
...
app/models/ability.rb
View file @
b66a1527
...
@@ -262,5 +262,13 @@ class Ability
...
@@ -262,5 +262,13 @@ class Ability
end
end
rules
rules
end
end
def
abilities
@abilities
||=
begin
abilities
=
Six
.
new
abilities
<<
self
abilities
end
end
end
end
end
end
app/models/user.rb
View file @
b66a1527
...
@@ -330,11 +330,7 @@ class User < ActiveRecord::Base
...
@@ -330,11 +330,7 @@ class User < ActiveRecord::Base
end
end
def
abilities
def
abilities
@abilities
||=
begin
Ability
.
abilities
abilities
=
Six
.
new
abilities
<<
Ability
abilities
end
end
end
def
can_select_namespace?
def
can_select_namespace?
...
...
app/services/base_service.rb
View file @
b66a1527
...
@@ -6,11 +6,7 @@ class BaseService
...
@@ -6,11 +6,7 @@ class BaseService
end
end
def
abilities
def
abilities
@abilities
||=
begin
Ability
.
abilities
abilities
=
Six
.
new
abilities
<<
Ability
abilities
end
end
end
def
can?
(
object
,
action
,
subject
)
def
can?
(
object
,
action
,
subject
)
...
...
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