end
def http_url_to_repo
- http_url = [Gitlab.config.url, "/", path, ".git"].join('')
+ http_url = [Gitlab.config.url, "/", path_with_namespace, ".git"].join('')
end
# Check if current branch name is marked as protected in the system
def valid?
# Authentication with username and password
- email, password = @auth.credentials
- self.user = User.find_by_email(email)
+ login, password = @auth.credentials
+
+ self.user = User.find_by_email(login) || User.find_by_username(login)
+
return false unless user.try(:valid_password?, password)
+ email = user.email
+
# Set GL_USER env variable
ENV['GL_USER'] = email
# Pass Gitolite update hook
@env['SCRIPT_NAME'] = ""
# Find project by PATH_INFO from env
- if m = /^\/([\w\.-]+)\.git/.match(@request.path_info).to_a
- self.project = Project.find_by_path(m.last)
+ if m = /^\/([\w\.\/-]+)\.git/.match(@request.path_info).to_a
+ self.project = Project.find_with_namespace(m.last)
return false unless project
end