Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb

2014-07-10 23:43:42 +03: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

groups_controller.rb

Group and Event strong_params

2014-06-26 16:57:10 +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

Fix project trasnfer for admin area

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

users_controller.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00