Add full commit message to commit api as field message.
Include "Merge-request reopened" emails in the proper email thread
Add an option to GET /projects in the GitLab API to exclude archived projects
Less verbose HipChat integration

Whenever a push with a lot of merges is made, the HipChat channel gets
overwhelmed. It is easy to loose everything else in all the GitLab
messages. It makes more sense to limit the number of commits shown.

The same problem happens with longer commit messages (like this one). It
will be useful to show only the subject of the commit message, not the
full one.
Prevent 500 if hook url is down, fixes #7376
history for files follows after rename
Disable 'Save changes' button if input is empty, fixes #6351
Rescue if markup fails, fixes #7455
Add retry option of travis and bundler
Use simple_format if we don't have a proper renderer
Use readme we support to render if there are multiple readmes
Turn if/else branch vor valid compare error message
Merge branch 'master' into 'master'

Let users limit by archived/not archived projects in GitLab API GET /projects

Adds a boolean parameter, archived, to the /projects endpoint.

See merge request !158
Merge branch 'less-chatty-hipchat-intergation' into 'master'

Less chatty HipChat intergation

The HipChat integration is noisy. In our team it constantly overwhelms the channel with a lot of commits or the bodies of their messages. It's very easy to loose the actual conversation in the midst of this.

This request does two things:

* Limit the number of shown commits on every push
* Display only the first line (the subject) of each commit messages

We tried it and found it was nicer for us :smile:

See merge request !159
fix searching on empty project, prevent 500

Fix hound
Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api

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

Conflicts:
	CHANGELOG
Merge branch 'christian.taedcke/gitlab-ce-add_complete_commit_message_to_api'
Restyle search page

Use ruby 1.9 syntax
Merge pull request #7432 from Razer6/disable_comment_btn_if_empty

Disable 'Save changes' button if input is empty, fixes #6351
Merge pull request #7417 from woita/follow-history-for-files

history for files follows after rename