Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

Do not execute hooks on empty projects, fixes #6108

Bump version to 7.2.0.pre to avoid backup version mismatches, fixes #7375

Improve markup gems to prevent 500 errors

Fix MergeRequest#new page

* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
* fix new file being skipped from diff if it was added in next commit

Fixes #1462

See merge request !998

Log sidekiq arguments

See merge request !940

* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Only redirect to referrer from public GitLab pages

See merge request !995

Add missing semicolon in application.scss

Was toying to import some custom css and found out about this :)

See merge request !157

Add a tip on how to test regular expressions

See merge request !994

Add merge moments to process

Fixes #1450

See merge request !986

Moved some behaviour to one place

Most starred projects page

Fixes #1461

See merge request !996

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

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

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

Exim problems

After merge report back to https://github.com/gitlabhq/gitlabhq/issues/4866

See merge request !990

Project services explained

See merge request !993

Backup settings warning

Fixes #1457

See merge request !992

Word requirement a bit more realistic

See commit message

See merge request !155

Improve star ui

* move star button to sidebar (where other buttons are)
* it fixes overflow issue for screens smaller then 1200px
* it fixes wrong vertical align for star button at old position
* add forks count too - so it looks similar with stars

Fixes #1460

See merge request !991

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>

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