Merge commit 'krawek/events' into project-events
authorJohan Sørensen <johan@johansorensen.com>
Sat, 19 Apr 2008 16:10:32 +0000 (18:10 +0200)
committerJohan Sørensen <johan@johansorensen.com>
Sat, 19 Apr 2008 16:12:45 +0000 (18:12 +0200)
commita1d82ee0e2c5e9c7ab1e30e869fb7b898779a9ee
treea33d3852c5cb07a825959d474b94d8a606659495
parent0a50afdae4950d76451c8ae0aec42974377eccc7
parentaaca8ce99f6558bf064e687adb376a06cb0f708c
Merge commit 'krawek/events' into project-events

* commit 'krawek/events':
  Fixed spec
  Removed actions from the database
  refactoring to use polymorphic associations (USER does ACTION on X)
  warn if the email does not match
  Renamed migrates: actions and events
  optimizations
  Performance improvements
  hooks: enable post-updateand added pre-receive
  Handle create and delete tag
  Fixed event: delete branch
  Script to setup the hooks
  Added avatar to events
  Implemented user event system
  Clone projects using gitorious hooks
  Load rails environment
  Create projects using gitorious hooks
  Added git template for new repositories

Conflicts:

app/models/project.rb
app/models/repository.rb
config/routes.rb
app/controllers/merge_requests_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/project.rb
app/models/repository.rb
app/models/user.rb
config/routes.rb
spec/models/repository_spec.rb