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

Conflicts:
	CHANGELOG

follow curl redirects

Patched `MergeRequest` to return more data.

prevent events duplication loading

Fix milestones description's max length

Fix 404 error when clicking the branch link on hipchat message

rtrim() input before checking if note form is empty

add git config --global core.autocrlf check

Restrict commit area resize to vertical.

Bump gitlab git

Fixes #1394

See merge request !1015

Cache LDAP check everywhere

See merge request !1008

Fix post-receive worker for some projects

If project ends with `-git` or `_git` or any kind of `git` - it get ignored by post-receive worker

See merge request !1018

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

Issue disable debug assets

Improve development speed. Concats all javascript into on file / HTTP request.

See merge request !1017

It's good for debugging javacsript, but creates massive amounts of http request
by adding each javascript individually. Only turn it on while debugging js code.

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

Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231db)

See merge request !145

Improve MR accept widget

* fixes UX problem with 2 confusing `click here` links.
* separate Accept MR block from manual merge instructions

See merge request !1014

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

Update `curl` commands to follow redirects (see
http://curl.haxx.se/docs/manpage.html#-L). Current `curl` commands will
return unexpected results if the requested content has been moved and is
returning information about where it has been moved to. Including the
`-L` option tells `curl` to follow the redirect so the file can be
correctly acquired.

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

Increase import timeout

Increase import timeout from 2 to 4 minutes. It allows repositories like `gitlabhq` be imported via UI

See merge request !1013

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

Improve dev seeds

See merge request !1012

* Improt projects inline so after seeds you have repos
* Fix merge request seeds
* Add comment seeds to both issues and merge requests
* Remove some projects from seeds to increase speed
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 encoding of output of markup, prevent 500 for non-ascii characters

#### What does this MR do?

This MR forces the output of `Github::markup` to have the same encoding as the input to it.

#### Why was this MR needed?

This prevents 500 errors if the markup contains non-asci characters.

#### What are the relevant issue numbers / Feature requests?

This MR closes

* #296
* https://github.com/gitlabhq/gitlabhq/issues/7023

/cc @jacobvosmaer

See merge request !160

Add retry option of travis and bundler

Turn if/else branch for valid compare error message

Improve readme markup,  fixes #7455

This reverts commit a5473561.
Because grit does not respect offset setting when follow: true which
cause invalid commit history for file

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

Fix 500 on searching on empty project, restyle search page

Prevent 500 if hook url is down when testing a hook, fixes #7376