fixes issue related with #342 (Merge Request view causes 100% CPU in firefox)

Conflicts:
	CHANGELOG

* 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>

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

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

If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982

Fix project default branch change

It is a regression since 7.0. It was caused with switch to `strong_params`.

This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433

See merge request !984

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

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

Fix signup config

See merge request !983

Patch email

See merge request !981

This partially reverts b5543be1 by restoring the nesting
for the signup_enabled and signin_enabled attributes.

Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153

Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144

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

Change admin email

Related to #1446

See merge request !979

Rc twitter

/cc @marin

See merge request !978

Release template

See merge request !974

Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions.

Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977

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>

Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse

Fix typos in CONTRIBUTING.md

This MR fixes two typos in [CONTRIBUTING.md](CONTRIBUTING.md).

Clariy squash comes after review.

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