From 893ce9ae24ffce68152cc0370ad74005e0997cee Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 22 Oct 2012 18:45:42 +0300 Subject: [PATCH 1/2] Fix git over HTTP --- lib/gitlab/backend/grack_auth.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index 05329baf0b..766e387455 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -53,6 +53,10 @@ module Grack end end + def can?(object, action, subject) + abilities.allowed?(object, action, subject) + end + def current_ref if @env["HTTP_CONTENT_ENCODING"] =~ /gzip/ input = Zlib::GzipReader.new(@request.body).read @@ -63,5 +67,15 @@ module Grack @request.body.rewind /refs\/heads\/([\w-]+)/.match(input).to_a.first end + + protected + + def abilities + @abilities ||= begin + abilities = Six.new + abilities << Ability + abilities + end + end end# Auth end# Grack From 4bc64b5530a45b26a13bf6e71d3b9d41aa1e8f98 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 22 Oct 2012 19:00:57 +0300 Subject: [PATCH 2/2] up to 3.0.1 --- CHANGELOG | 3 +++ VERSION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ee393cd7f6..b9332c9d44 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 3.0.1 + - Fixed git over http + v 3.0.0 - Projects groups - Web Editor diff --git a/VERSION b/VERSION index 4a36342fca..cb2b00e4f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0 +3.0.1