Jacob Schatz f68f837d87 Merge branch 'merge-button-color-fix' into 'master' ...

Fixed issue with button color when no CI enabled

## What does this MR do?

Fixes an issue with the color of the merge button when no CI is setup.

## What are the relevant issue numbers?

Closes #17844

## Screenshots

![Screen_Shot_2016-05-25_at_09.58.44](/uploads/87aac74c5e2f8bfd2831e99c5915856d/Screen_Shot_2016-05-25_at_09.58.44.png)

See merge request !4287

2016-05-25 14:28:42 +00:00

..

assets

Merge branch 'merge-button-color-fix' into 'master'

2016-05-25 14:28:42 +00:00

controllers

Fixed issue with button color when no CI enabled

2016-05-25 11:08:00 +01:00

finders

Fix outer join when filtering milestones

2016-05-24 16:51:43 -04:00

helpers

Make conditional a guard clause

2016-05-25 08:15:20 -04:00

mailers

Syntax-highlight diffs in push emails

2016-05-17 13:23:17 +01:00

models

Merge branch 'issue_15221_2'

2016-05-25 14:09:57 +02:00

services

Fix the CI login to Container Registry (the gitlab-ci-token user)

2016-05-23 00:34:51 +02:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Remove conditional

2016-05-25 08:15:20 -04:00

workers

Merge branch '17464-backport-email-syntax-highlighting' into 'master'

2016-05-19 21:12:53 +00:00