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

Conflicts:
	app/views/layouts/_head_panel.html.haml

Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded

Improvements to search layout

Improve search layout to match new UI style and make it more mobile-firendly

See merge request !585

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

Add footnotes support to Markdown

This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555

See merge request !572

Move service template and project service settings into a shared view

This MR reconciles the small differences in the error message layout between the template and project settings, and moves the partial into a shared view. This came from a mention in https://github.com/gitlabhq/gitlabhq/issues/9181 to take care of this.

See merge request !588

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

Add phrase "Here's how to close multiple issues in one commit message"

Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users.

cc/ @sytse

See merge request !1801

Remove abandoned GroupMembers

https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457

See merge request !1802

This reverts commit 570594a4.

Move search categories (projects, issues etc) below search field. Instead use sidebar for dashbaord nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix #9219 Affix menu size change

Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users

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

Send 500 errors as JSON in the API

Fix bug where commit data would not appear in some subdirectories

Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:

https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b7) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.

* Closes #1478, #1459
* Closes https://github.com/gitlabhq/gitlabhq/issues/9037

See merge request !581

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

Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797

Fix adding new group members from admin area

Fix for #2222

Tests for this case already exists but it was green.
It related to current way dealing with ajax selectbox.
Improving tests might be a reason for another merge requests - everyone is welcome to participate.

See merge request !1796

Add a rake task to automatically restart foreman when changes occur

Add more instructions on how to publish docker images yourself.

See merge request !1800

Fix (project_)name_regex to accept non-ASCII letters and dash

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

Fix broken file browsing with relative submodule in personal projects

Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.

To reproduce the problem, go here:

https://gitlab.com/andrewwu.tw/submodule-test/tree/master

Closes https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !565

Add api version property on hipchat service