Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
3cc55fe4fe
2 changed files with 4 additions and 4 deletions
|
@ -44,7 +44,7 @@ class IssuableFinder
|
|||
table_name = klass.table_name
|
||||
|
||||
if project
|
||||
if project.public? || (current_user && current_user.can?(:read_project, project))
|
||||
if Ability.abilities.allowed?(current_user, :read_project, project)
|
||||
project.send(table_name)
|
||||
else
|
||||
[]
|
||||
|
|
|
@ -11,8 +11,9 @@ Gitlab::Application.configure do
|
|||
# Disable Rails's static asset server (Apache or nginx will already do this)
|
||||
config.serve_static_assets = false
|
||||
|
||||
# Compress JavaScripts and CSS
|
||||
config.assets.compress = true
|
||||
# Compress JavaScripts and CSS.
|
||||
config.assets.js_compressor = :uglifier
|
||||
# config.assets.css_compressor = :sass
|
||||
|
||||
# Don't fallback to assets pipeline if a precompiled asset is missed
|
||||
config.assets.compile = true
|
||||
|
@ -74,7 +75,6 @@ Gitlab::Application.configure do
|
|||
config.action_mailer.raise_delivery_errors = true
|
||||
|
||||
config.eager_load = true
|
||||
config.assets.js_compressor = :uglifier
|
||||
|
||||
config.allow_concurrency = false
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue