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

Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb

2015-05-13 14:10:14 +03:00

..

accounts_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

application_controller.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

avatars_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

emails_controller.rb

Merge branch 'change-primary-email' into 'master'

2015-05-03 11:00:51 +00:00

keys_controller.rb

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

2015-05-05 10:18:27 +02:00

notifications_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

passwords_controller.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

two_factor_auths_controller.rb

Clear all 2FA-related fields when user disables the feature

2015-05-09 17:32:49 -04:00