Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml

2014-05-12 12:39:51 +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

Remove deprecated finders

2014-01-19 23:39:56 +04: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

Add sort dropdown for admin projects page

2014-05-02 17:02:57 +03:00

users_controller.rb

Fix 500 error when try to update own profile in admin area

2014-02-25 10:15:43 +02:00