Include "Merge-request reopened" emails in the proper email thread
Force of markup output to be the input encoding
Merge branch 'fix_markup_encoding' into 'master'

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
more changelog entries

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

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

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

* 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>
Merge branch 'improve-dev-seeds' into 'master'

Improve dev seeds

See merge request !1012
Increase import timeout from 2 to 4 minutes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'increase-import-timeout' into 'master'

Increase import timeout

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

See merge request !1013
Update cahngelog

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Separate accept MR settings from manual merge instructions. Remove confusing `click here` links

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'mr-accept-widget' into 'master'

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
Merge branch 'more-email-threading' into 'master'

Additions to email threading

This MR follows !142:

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

See merge request !145
Add, delete labels via API
Update labels via API