Sebastian Ziebell eefb27f5ae Merge branch 'master' into fixes/api ...

Conflicts:
	spec/requests/api/projects_spec.rb

2013-02-20 12:43:32 +01:00

..

assets

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

2013-02-19 11:01:19 +02:00

contexts

Merge Request uses StateMachine now

2013-02-18 14:43:50 +04:00

controllers

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

2013-02-19 11:01:19 +02:00

decorators

add into user decorator (presenter) to full user name

2013-01-24 22:31:24 +02:00

helpers

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

2013-02-19 11:01:19 +02:00

mailers

Add a delay for sending emails

2013-02-01 17:04:41 +02:00

models

Merge branch 'master' into fixes/api

2013-02-20 12:43:32 +01:00

observers

Observer refactored to use StateMachine events

2013-02-18 16:49:17 +04:00

uploaders

skip protection to aws3

2013-02-15 09:49:35 +02:00

views

Add commit full time tooltip to commited_ago

2013-02-19 19:56:43 +04:00

workers

Update post-receive worker to use correct identifier

2013-02-14 14:00:02 +02:00