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

..

accounts_controller.rb

Move profile account to separate controller

2013-10-09 16:43:17 +03:00

avatars_controller.rb

Expire event cache on avatar creation/removal

2013-12-11 09:30:22 -06:00

emails_controller.rb

Make app works with strong params

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

groups_controller.rb

User can leave group from group page.

2014-02-12 15:52:53 +01:00

keys_controller.rb

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

2014-07-10 23:43:42 +03:00

notifications_controller.rb

Move Profile related controllers under Profiles:: module

2013-06-24 18:24:14 +03:00

passwords_controller.rb

Fix password change. Fix test settings

2014-06-26 23:40:08 +03:00