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

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

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb

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

..

appearances_controller.rb

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

application_controller.rb

Added the correct hierarchy of controllers for the administrative part

2013-01-24 22:31:24 +02:00

background_jobs_controller.rb

Correct BackgroundJobs page for both OSX and linux

2014-03-13 23:15:33 +02:00

broadcast_messages_controller.rb

Ability to remvoe broadcast messages

2013-11-12 15:20:31 +02:00

dashboard_controller.rb

Add more info to admin dashboard

2013-11-20 13:41:41 +02:00

groups_controller.rb

Improve admin group page performance

2014-06-02 18:58:00 +03:00

hooks_controller.rb

Added the correct hierarchy of controllers for the administrative part

2013-01-24 22:31:24 +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

Fix project trasnfer for admin area

2014-06-19 13:20:42 +03:00

users_controller.rb

Add option for admin to remove users secondary emails.

2014-06-23 09:45:26 +02:00