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

Conflicts:
	CHANGELOG

Added ability to serve files in wiki repository

API patch

Ensure that uid in OAuth is a string

Removed some constant allready defined warnings

Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973

Fix timeout error when preparing git graph.

Add support to set satellites timeout

[UI] Increase diff byte highlight contrast.

Explore area

Fixes #1426

See merge request !987

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

Ruby rake check

Fix #1456

See merge request !989

Improve release templates

See merge request !985

Fix for ruby 1.9

Fixes #1452

See merge request !988

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>

Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Typo fix.

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