Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

appearances_controller.rb

Add ability to remove the branded page logo.

2014-09-26 14:52:11 +02: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

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

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

hooks_controller.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03: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

Admin: user sorting

2014-10-13 16:07:57 +03:00