Dmitriy Zaporozhets 94f130cbfc Merge branch 'admin-edit-identities' into 'master' ... Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843		2015-06-23 14:24:16 +00:00
..
application_controller.rb	Add helpers for header title and sidebar, and move setting those from controllers to layouts.	2015-05-01 10:39:16 +02:00
application_settings_controller.rb	session_expire_seconds => session_expire_delay	2015-06-10 22:10:00 -04:00
applications_controller.rb	Small improvements to CI	2015-01-17 16:17:34 -08:00
background_jobs_controller.rb	Use Gitlab.config instead of Settings everywhere	2014-10-15 23:01:31 +02:00
broadcast_messages_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
dashboard_controller.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
deploy_keys_controller.rb	Remove show actions from Admin and Project DeployKeys	2015-06-03 18:03:04 -04:00
groups_controller.rb	Wrap group removal into service	2015-06-03 14:07:20 +02:00
hooks_controller.rb	Added X-GitLab-Event header for web hooks	2015-05-08 16:49:03 +03:00
identities_controller.rb	Fix admin identities code	2015-06-23 10:26:50 +02:00
keys_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
logs_controller.rb	Added the correct hierarchy of controllers for the administrative part	2013-01-24 22:31:24 +02:00
projects_controller.rb	An in_namespace scope is already present	2015-06-09 13:42:01 +02:00
services_controller.rb	Fix bug where Slack service channel was not saved in admin template settings.	2015-04-24 08:33:24 -07:00
users_controller.rb	Merge branch 'admin-edit-identities' into 'master'	2015-06-23 14:24:16 +00:00