# Conflicts:
#	app/assets/stylesheets/framework/common.scss

[ci skip]

Resolve "Profile audit log does not show Google icon properly"

Closes #50180

See merge request gitlab-org/gitlab-ce!21207

Expose all artifacts sizes in jobs api

See merge request gitlab-org/gitlab-ce!20821

Fixes #50180

CE upstream - 2018-08-14 16:07 UTC

Closes gitaly#1233, gitaly#1286, and gitlab-org/quality/nightly#3

See merge request gitlab-org/gitlab-ee!6892

Remove scss variables, part 2

See merge request gitlab-org/gitlab-ce!21169

EE- Remove scss variables, part 2

See merge request gitlab-org/gitlab-ee!6887

# Conflicts:
#	app/services/notification_recipient_service.rb
#	doc/user/project/issue_board.md
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-08-13 21:22 UTC

Closes gitlab-ce#50210

See merge request gitlab-org/gitlab-ee!6888

Resolve "Auto Devops failing to fetch Alpine glibc pubkey"

Closes gitlab-org/quality/nightly#3 and #50257

See merge request gitlab-org/gitlab-ce!21182

Backport of EE changes "Customize notifications for new epic - Web and API"

See merge request gitlab-org/gitlab-ce!20793

Resolve "Customize notifications for new epic - Web and API"

Closes #5863

See merge request gitlab-org/gitlab-ee!6626

Creates a vue component for the job log trace output

See merge request gitlab-org/gitlab-ce!21167

Update GET project URL to be similar to GET user URL

See merge request gitlab-org/gitlab-ce!21130

These are dynamic translations, so has to be marked explicitly using `N_`,
but they are not used in runtime, so can exist in separate file.
https://github.com/grosser/gettext_i18n_rails#unfound-translations-with-rake-gettextfind

Change `Backlog` list title to `Open` in Issue Boards

Closes #48942

See merge request gitlab-org/gitlab-ce!21131

EE: Change `Backlog` list title to `Open` in Issue Boards

See merge request gitlab-org/gitlab-ee!6884

Remove feature gate for ListNewCommits

Closes gitaly#1286 and gitaly#1233

See merge request gitlab-org/gitlab-ce!21184

Remove storage path dependency of gitaly install task

See merge request gitlab-org/gitlab-ce!21101

Upgrade Middleman template for GitLab CI

See merge request gitlab-org/gitlab-ce!21174

`disable_statement_timeout` will no longer leak to other migrations

Closes #48967

See merge request gitlab-org/gitlab-ce!20503

Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20087,
this has been tested on .com now, and is stable.

Closes https://gitlab.com/gitlab-org/gitaly/issues/1286
Closes https://gitlab.com/gitlab-org/gitaly/issues/1233

These are dynamic translations, so has to be marked explicitly using `N_`,
but they are not used in runtime, so can exist in separate file.
https://github.com/grosser/gettext_i18n_rails#unfound-translations-with-rake-gettextfind

Vendored in from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/185

Thanks @sgerrand

This fixes https://gitlab.com/gitlab-org/quality/nightly/issues/3 because the code_quality job holds up the production job. Waiting longer should reduce the likelihood of this.

Creates a Vue component for the erased block on the job view page

See merge request gitlab-org/gitlab-ce!21158

Remove https from Snowplow Collector URI placeholder in Admin Area

See merge request gitlab-org/gitlab-ee!6886

Resolve "Pagination formatting on /admin/spam_logs endpoint is broken"

Closes #50047

See merge request gitlab-org/gitlab-ce!21145