Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

assets

Advise to refine search when no match is returned.

2014-08-25 12:39:45 +02:00

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

finders

Show projects that are not private and are shared with the group.

2014-08-19 14:21:38 +02:00

helpers

Consistency: Capitalize hex values of sugested colors

2014-08-19 18:20:38 +02:00

mailers

Send email notifying user he has been unsubscribed.

2014-08-26 17:15:43 +02:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

workers

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00