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

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

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb

2015-04-24 11:22:54 +03:00

..

accounts_controller.rb

Restyle oauth accounts at profile page and add ability to unlink account

2015-03-21 17:46:00 -07:00

avatars_controller.rb

Expire event cache on avatar creation/removal

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

emails_controller.rb

Allow user to choose which email to be public

2015-04-14 19:42:48 +08:00

keys_controller.rb

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

2015-04-24 11:22:54 +03:00

notifications_controller.rb

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

passwords_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02:00