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
Tatuya Kamada
gitlab-ce
Commits
8702cef2
Commit
8702cef2
authored
Aug 08, 2016
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't double-cache project_abilites
parent
99ee8620
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
11 deletions
+2
-11
app/models/ability.rb
app/models/ability.rb
+2
-11
No files found.
app/models/ability.rb
View file @
8702cef2
...
@@ -181,17 +181,8 @@ class Ability
...
@@ -181,17 +181,8 @@ class Ability
end
end
def
project_abilities
(
user
,
project
)
def
project_abilities
(
user
,
project
)
key
=
"/user/
#{
user
.
id
}
/project/
#{
project
.
id
}
"
if
RequestStore
.
active?
RequestStore
.
store
[
key
]
||=
uncached_project_abilities
(
user
,
project
)
else
uncached_project_abilities
(
user
,
project
)
end
end
def
uncached_project_abilities
(
user
,
project
)
rules
=
[]
rules
=
[]
# Push abilities on the users team role
# Push abilities on the users team role
rules
.
push
(
*
project_team_rules
(
project
.
team
,
user
))
rules
.
push
(
*
project_team_rules
(
project
.
team
,
user
))
...
@@ -218,7 +209,7 @@ class Ability
...
@@ -218,7 +209,7 @@ class Ability
rules
-=
project_archived_rules
rules
-=
project_archived_rules
end
end
(
rules
-
project_disabled_features_rules
(
project
)).
uniq
rules
-
project_disabled_features_rules
(
project
)
end
end
def
project_team_rules
(
team
,
user
)
def
project_team_rules
(
team
,
user
)
...
...
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