Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee ...

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

appearances_controller.rb

Custom header logo

2014-12-29 13:42:15 -06:00

application_controller.rb

Added the correct hierarchy of controllers for the administrative part

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

application_settings_controller.rb

Allow configuring protection of the default branch upon first push

2015-01-25 17:09:10 +01: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

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

dashboard_controller.rb

Add more info to admin dashboard

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

emails_controller.rb

Fix typo

2014-08-12 17:25:04 +02:00

groups_controller.rb

Set group name from path in admin controller

2014-12-22 13:55:32 +02:00

hooks_controller.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

keys_controller.rb

Move user key manipulation in admin section to a separate controller.

2014-12-30 10:15:11 +01: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

Remove unused admin/projects#repository method

2014-10-21 10:56:11 +02:00

users_controller.rb

Share the key table between admin and profile resources.

2014-12-30 11:01:30 +01:00