Merge branch 'master' into rails-4.1.9
This commit is contained in:
commit
b5592fd695
|
@ -11,10 +11,11 @@ module Grack
|
|||
return render_not_found if project.blank?
|
||||
|
||||
return ::Rack::Auth::Basic.new(@app) do |u, p|
|
||||
user = User.auth_by_token_or_login_pass(u, p) and
|
||||
ability = ::Ability.new(user) and ability.can?(action, project) and
|
||||
ENV['GL_ID'] = "user-#{user.id}"
|
||||
end.call(env) unless project.public? and read? # need auth
|
||||
user = User.auth_by_token_or_login_pass(u, p) and
|
||||
ability = ::Ability.new(user) and ability.can?(action, project) and
|
||||
ENV['GL_ID'] = "user-#{user.id}" and
|
||||
ENV['GL_REPO_NAME'] = project.path
|
||||
end.call(env) unless project.public? && read? # need auth
|
||||
end
|
||||
@app.call(env) # next app in stack
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue