Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

2015-03-25 09:16:09 -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

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

2015-03-16 21:25:00 -07: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

Use project_member instead of team_member.

2015-03-15 13:50:38 +01: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

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

services_controller.rb

Include missing events and fix save functionality in admin service template settings form

2015-03-23 05:51:38 -07:00

users_controller.rb

Improve user block/unblock UI in admin area

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