summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorFlorian Unglaub <florian.unglaub@nix-wie-weg.de>2012-08-24 15:25:52 +0200
committerFlorian Unglaub <florian.unglaub@nix-wie-weg.de>2012-08-24 15:25:52 +0200
commit48443d20ca9aa10323c1b81835e519680b10debc (patch)
tree7488eeab446a1a01f90450e50028bfcbdc0ad1d0 /app/models/project.rb
parentc5ae1549a1d09599734ccaab27e90a8752f1ede6 (diff)
parent6d4ae75f544d9819954865c105414a722344336a (diff)
downloadgitlab-ce-48443d20ca9aa10323c1b81835e519680b10debc.tar.gz
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 714953c64c7..3fe11916504 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2,7 +2,7 @@ require "grit"
class Project < ActiveRecord::Base
include Repository
- include ProjectPush
+ include PushObserver
include Authority
include Team