Dmitriy Zaporozhets ae713ae8fc 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
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md

2015-06-17 11:25:59 +02: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

preferences_controller.rb

Spec the failure cases for PreferencesController#update

2015-06-13 17:59:12 -04:00

two_factor_auths_controller.rb

Bump secret key length to 32

2015-05-23 18:47:53 -04:00