CE to EE stable



See merge request !446

Time ago fix for compare page



See merge request !1905

CE to EE stable



See merge request !443

Update changelog for 7-13 stable



See merge request !444

7-13 stable: changelog update



See merge request !1901

This reverts commit 8a01a122.

fixed notifications title

I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.


See merge request !1897

CE to EE

Fixes gitlab/gitlabhq#2496

cc @valery 

See merge request !442

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

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

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

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900

Add nice scroll for sidebar

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

See merge request !978

Hide scrollbar from sidebar when external mouse is connected to OSX

See merge request !977

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

create update guides for 7.13



See merge request !1899

update guides for 712 and 713



See merge request !441

Move coverage-related setup back to spec_helper

These tools must be loaded before our regular Rails environment.

Partially reverts 57830201

See merge request !976