# Conflicts:
#	app/assets/stylesheets/pages/commits.scss
#	app/views/projects/issues/_nav_btns.html.haml

[ci skip]

Fix security products examples

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

set proper signature marker in mails

Closes #43617

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

Add more detail to cleanup steps for background migrations

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

CE upstream - 2018-04-17 20:56 UTC

Closes gitaly#401 et gitlab-org/release/docs#9

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

Fix regression around new SHA widget in "New Merge Request" Screen

Closes #45446

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

EE Port of CE!18422

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

Improve web IDE commit input

Closes #44832

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

Ensure that cached_markdown_version is handled correctly for CommonMark

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

[Rails5] Add `safe_params` helper

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

Ee blackst0ne rails5 add safe params helper

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

1. We can't just steal from the queue, in case there was a problem with Sidekiq.
2. We need to consider import / export.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>

use rfc 3676 mail signature delimiters ("-- ") instead of the previous
"---" one.

closes #43617
Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de>

This reverts merge request !18399

Fix link in Security Developer Workflow.md

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

Email notification on issue due date

Closes #27500

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve "Make a Rubocop that forbids returning from a block"

Closes #42889

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

EE: Resolve "Make a Rubocop that forbids returning from a block"

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

Resolve "Concurrent requests to api/v4/jobs/request cause DB locks on ci_builds_metadata table"

Closes #45456

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

Resolve "Using goldiloader results in Ci::RegisterJobService#execute spending a lot of time eager loading a lot of associations"

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

Resolve "Time estimate system notes can be confusing"

Closes #40402

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

Avoid wrong closing dates being caught by the query on Burndown charts

Closes gitlab-com/support-forum#3273

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

Docs assign labels to subgroups

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

Update docs subgroup issues in group board

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

Fix Markdown typo in Web IDE docs

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

Fix `Trace::HttpIO` can not render multi-byte chars

Closes #44981

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

Remove differences with CE version of update_pages_service.rb

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

Improve jobs queuing time metric (fixed version)

Closes #45205

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

Usage ping for projects_reporting_ci_cd_back_to_github

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

Return nil on empty path

Closes gitaly#1115

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

Merge branch 'jej/5598-documentation-changelog-for-branch-unprotection-restrictions-api' into 'master'

First part of "Documentation & Changelog for Branch Unprotection Restrictions & API"

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

[Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`

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

Merge branch '42889-avoid-return-inside-block' of gitlab.com:jacopo-beschi/gitlab-ce into 42889-avoid-return-inside-block-ee

* '42889-avoid-return-inside-block' of gitlab.com:jacopo-beschi/gitlab-ce:
  Uses the rubocop helpers expect_offense and expect_no_offenses
  Updates after 4th review
  Updates after 3rd review
  Updates after 2nd review
  Fixes cop errors
  Adds AvoidBreakFromStrongMemoize Cop
  Minor review changes
  Adds Rubocop rule to avoid returning from a block