Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre ...

Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb

2015-02-23 23:56:59 -08:00

..

assets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

finders

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-19 12:01:56 -08:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

uploaders

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

views

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

workers

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00