Dmitriy Zaporozhets 135372849d Fix conflict ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2015-04-15 20:22:23 +03:00

..

application_controller.rb

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

2015-04-15 19:22:57 +03:00

avatars_controller.rb

added group avatars

2014-01-28 08:38:00 +01:00

group_members_controller.rb

Fix conflict

2015-04-15 20:22:23 +03:00

hooks_controller.rb

Web hook: controller refactoring

2015-03-12 20:51:38 +02:00

ldap_group_links_controller.rb

Web hook: controller refactoring

2015-03-12 20:51:38 +02:00

ldaps_controller.rb

Use new group members route.

2015-04-06 22:44:19 +02:00

milestones_controller.rb

Rename manage_group ability to admin_group for consistency with project.

2015-04-14 12:05:49 +02:00