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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

appearances_controller.rb

Improve GitLab EE appearance

2015-03-03 22:04:25 -08: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

Add help_text to help text, login and static error pages.

2015-02-26 12:23:09 -08: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

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

emails_controller.rb

Fix typo

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

groups_controller.rb

Refactor sorting in project

2015-02-05 19:15:05 -08: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

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

services_controller.rb

Add option to disable code diffs to EmailOnPush.

2015-02-25 14:29:49 +01:00

users_controller.rb

Improve user block/unblock UI in admin area

2015-03-09 13:02:06 -07:00