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

..

ldap_group_links

Change naming of multi-LDAP to linked LDAP groups

2014-08-15 12:19:07 +02:00

milestones

Show milestone state on group milestone show page.

2014-07-15 11:59:37 +02:00

_filter.html.haml

Filter group milestones.

2014-06-30 09:44:30 +02:00

_new_group_member.html.haml

Adopt Group#members page for large groups (> 100 users)

2014-02-13 11:00:44 +02:00

_projects.html.haml

Dont truncate project names on group page

2014-06-12 16:16:29 +03:00

_settings_nav.html.haml

Change naming of multi-LDAP to linked LDAP groups

2014-08-15 12:19:07 +02:00

_shared_projects.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

edit.html.haml

Fix Group#edit form

2014-08-15 10:32:53 +02:00

issues.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

issues.html.haml

Show counters in sidebar filter in same way like we did for projects page

2014-07-10 17:54:31 +03:00

members.html.haml

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

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

merge_requests.html.haml

Show counters in sidebar filter in same way like we did for projects page

2014-07-10 17:54:31 +03:00

new.html.haml

Merge branch 'patch-2' into 'master'

2014-06-24 06:45:38 +00:00

projects.html.haml

Improve group settings UI

2014-05-29 21:30:20 +03:00

show.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

show.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes

2014-06-26 13:02:08 +03:00