Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

Disable reserverd project names

Fixes #1550

See merge request !1471

Because since project always belongs to namespace it dont need such
strict restrictions any more

Removes the hard-coded font in the diff notes

Removes the hard-coded font in the diff notes and switches to using the $regular_font variable.

See merge request !259

Fix group search to check path as well as name

The API documentation says:

"You can search for groups by name or path with: /groups?search=Rails"

But you can't because the search query only checks the name, not the path. This fixes that.

See merge request !325

Fix the intermittently failing "Bar" search tests.

Over the past several months we've come to calling them the foobarred tests. We've seen them fail on our jenkins server, and on the GitLab semaphore tests.

In this merge request I scope the test checks for the foo barred tests to check within the .search-results div.

Fixes #567

See merge request !258

Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")

Socket [::]:123 on Linux listens on IPv4 and IPv6

Also show colors in the sidebar of comment

Added a way to retrieve MR files

Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328

available topics are quite short.

Also correct some missing words, punctuation.

Fixes #8478. Update timfel-krb5-auth to 0.8.2.

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

 Drop comments on cookbook installing from source now that it uses Omnibus.

gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake

See merge request !318

Add more maintenance tasks to documentation

See merge request !317

Fix for a "500: Encoding error" in the blame view

What does this MR do?

- The change enforces UTF-8 encoding on the source line data obtained from the Git.

Are there points in the code the reviewer needs to double check?

- The fix might not be enough to fix all encoding error issues in the blame view. There might be similar encoding issues if there are non-UTF-8 encoded names, for example

Why was this MR needed?

- This change fixes the "500: encoding error" that I get when I try to view the Gitlab source CHANGELOG file.

What are the relevant issue numbers / Feature requests?

- Gitlab issue #894: https://gitlab.com/gitlab-org/gitlab-ce/issues/894

See merge request !298

Mwessel/gitlab ce configure protection

See merge request !1467

Remove hidden settings text on project settings

No need to have the hidden settings text anymore as the danger area is now unified.

See merge request !320

Fix raw image paste from clipboard

product names, plus a couple of instances of bad Markdown markup.

Fix capitalization of URL.

A targeted fix in the documentation.

See merge request !323

Webhook rescue Errno::ECONNRESET

Fixes #1821

See merge request !1466

Collapseable sidebar

See merge request !1465

Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav