# Conflicts:
#	Gemfile.lock

Add a help text to the Slack Service

When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook

See merge request !1302

Use fixed version of fogbugz gem

This allows us to properly handle authentication errors.

When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Reorder the `--without` arugments so the database comes first

Hopefully this will make it a bit clearer that we're excluding a certain
database type.

[ci skip]

See merge request !1301

Hopefully this will make it a bit clearer that we're excluding a certain
database type.

[ci skip]

Minor editing of the 7.14-to-8.0 update guide

[ci skip]

See merge request !1300

change coverage image to svg [ci skip]

Fix empty project UI

In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI.

**Current:**

![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png)

**As proposed:**

![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png)

See merge request !1291

Don't display "git clone --bare <URL>" if no URL is available

Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png)

See merge request !1295

Update gitlab_emoji to 0.1.1

See merge request !1290