Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev ...

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml

2013-06-30 11:35:40 +03:00

..

assets

Merge branch 'master' into 6-0-dev

2013-06-30 11:35:40 +03:00

contexts

Merge branch 'master' into 6-0-dev

2013-06-30 11:35:40 +03:00

controllers

fixed typo in assgned

2013-06-29 16:37:41 +03:00

helpers

Merge branch 'master' into 6-0-dev

2013-06-30 11:35:40 +03:00

mailers

Send project transfer email to all members. Added specs for project move email

2013-06-22 10:56:51 +03:00

models

Prevent confusion in naming user variable at admin area

2013-06-26 15:57:02 +03:00

observers

Update repository head when change default project branch

2013-06-25 17:05:39 +03:00

services

Merge branch 'master' into 6-0-dev

2013-06-24 22:13:00 +03:00

uploaders

Files controller handle redirect to remote storage. Added config block to carrierwave init

2013-05-15 22:35:59 +03:00

views

Merge branch 'master' into 6-0-dev

2013-06-30 11:35:40 +03:00

workers

Refactor post-receive worker

2013-04-29 09:43:18 +03:00