delta/gitlab/gitlab-ce.git/CHANGELOG, branch diff-commit-id-weight

Merge branch '18474-missing-images-on-confirmation-email' into 'master'

2016-06-16T14:50:05+00:00


Fix images in emails

Closes #18474. The confirmation email is actually the only one that uses the `image_tag` helper at the moment, but this will work for all of them:
```shell
$ ag image_tag -G mailer
app/views/layouts/devise_mailer.html.haml
13:              = image_tag('mailers/gitlab_header_logo.png', id: 'logo', alt: 'GitLab Wordmark')
24:                  = image_tag('mailers/gitlab_tanuki_2x.png', alt: 'GitLab Logo')
```

See merge request !4705

Merge branch '18521-tanuki-logo' into 'master'

2016-06-16T13:49:27+00:00


Lighten each logo path color instead of white

## What does this MR do?
Changes highlight/loading colors of tanuki from white to a lighter version of each path color

## Why was this MR needed?
Since the logo is no longer on the dark sidebar, the highlight color was getting lost against the light gray background

## What are the relevant issue numbers?
Closes #18521 

## Screenshots (if relevant)
![logo](/uploads/3743925862fa8e17d2fec426f7e4c853/logo.gif)

cc @jschatz1 @lbennett @dzaporozhets 

See merge request !4690

Merge branch '18582-banzai-filter-external-link-filter' into 'master'

2016-06-16T13:22:41+00:00


Banzai::Filter::ExternalLinkFilter use XPath

See merge request !4702

Banzai::Filter::ExternalLinkFilter use XPath

2016-06-16T12:13:29+00:00

Merge branch 'fix/status-of-pipeline-without-builds' into 'master'

2016-06-16T11:48:36+00:00


Improve pipeline status in case that pipeline has no jobs

## What does this MR do?

This MR resolves problem with pipeline status when there are no build in pipeline.

This can happen when builds were skipped - for example - by using `only`/`except` keyword in `.gitlab-ci.yml`.

## What are the relevant issue numbers?

Closes #17977

See merge request !4403

Fix images in emails

2016-06-16T10:47:01+00:00

Banzai::Filter::UploadLinkFilter use XPath

2016-06-16T09:26:56+00:00

Merge branch 'long-commit-message-scroll-fix' into 'master'

2016-06-16T00:32:24+00:00


Fix long commit message scroll issue.

Fixes horizontal scrollbar for long commit description.

## Before
![before_](/uploads/d261e26044d8ab451bc7768b16316253/before_.png)

## After
![after](/uploads/f27227a77d25d80b797e3ffc916d1957/after.png)

See merge request !4643

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-message-scroll-fix

2016-06-15T23:24:19+00:00

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown

2016-06-15T23:04:09+00:00

# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee