Fixed tests. removed delegate to id

This commit is contained in:
Dmitriy Zaporozhets 2012-02-29 23:04:09 +02:00
parent bb164ebf1b
commit 25bde28d13
6 changed files with 27 additions and 13 deletions

View file

@ -14,7 +14,7 @@ class Key < ActiveRecord::Base
before_save :set_identifier
after_save :update_repository
after_destroy :repository_delete_key
delegate :id, :name, :email, :to => :user, :prefix => true
delegate :name, :email, :to => :user, :prefix => true
def set_identifier
if is_deploy_key

View file

@ -117,7 +117,7 @@ class Project < ActiveRecord::Base
before: oldrev,
after: newrev,
ref: ref,
user_id: key.user_id,
user_id: key.user.id,
user_name: key.user_name,
repository: {
name: name,

View file

@ -16,7 +16,7 @@ class UsersProject < ActiveRecord::Base
validates_presence_of :user_id
validates_presence_of :project_id
delegate :id, :name, :email, :to => :user, :prefix => true
delegate :name, :email, :to => :user, :prefix => true
def self.bulk_import(project, user_ids, project_access, repo_access)
UsersProject.transaction do

View file

@ -5,6 +5,9 @@ class PostReceive
project = Project.find_by_path(reponame)
return false if project.nil?
# Ignore push from non-gitlab users
return false unless Key.find_by_identifier(author_key_id)
project.observe_push(oldrev, newrev, ref, author_key_id)
project.execute_web_hooks(oldrev, newrev, ref, author_key_id)
end