Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 ...

Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

2014-08-15 10:25:23 +02: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

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

Fix bug: edit LDAP group settings from admin panel

2014-07-28 16:28:09 +02: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

Fix project trasnfer for admin area

2014-06-19 13:20:42 +03:00

users_controller.rb

Merge branch 'new_user_password_set' into 'master'

2014-07-23 16:44:07 +00:00