# Conflicts:
#   db/schema.rb

Add Configuration team to the list

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

Prevent Gitaly WriteConfig log noise

Closes gitaly#1221

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

Add background migrations to archive legacy job traces

Closes #46642

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

Also verify if extending would override a class method

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

Resolve "NoMethodError: undefined method `previous_changes' for nil:NilClass"

Closes #46452

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

Perform pull request IO work outside a transaction

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

Update security products job and artifact names in documentation.

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

Support rails5 in postgres indexes function and fix some migrations

Closes #46236

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

Fix Rubocop offense in build specs

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

Optimise pages service calling

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

Bring CE-EE parity to app/services/projects/update_service.rb

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

Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs

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

Resolve "Add Xcode Button in UI"

Closes #45820

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

Fixed alignment issues with IDE sidebar

Closes #47244

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

Fix jobs log background color

Closes #47261

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

[Rails5] Update Gemfile.rails5.lock

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

Support presigned multipart uploads

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

Remove N+1 query for author in issues API

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

Resolve "Wiki print view is broken"

Closes #47236

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

Support smarter system notes

Closes #33166

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

Bring back the EE changes to CE to authentication of builds

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

 Conflicts:
   app/models/ci/pipeline.rb

Updated vendored ADO template

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

Adjust insufficient diff hunks being persisted on NoteDiffFile

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

Include all ancestors milestones in json list & autocomplete

Closes #36862

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

Resolve "Admin area > Import sources and restricted visibility level checkboxes styling"

Closes #47266

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

Hide archived projects from `shared_projects`

Closes #47206

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

Use gitlab-shell 7.1.4

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

Since extending a class means including on the singleton class of the
class, this should now complain this:

``` ruby
module M
  extend Gitlab::Utils::Override

  override :f
  def f
    super.succ
  end
end

class C
  extend M

  def self.f
    0
  end
end
```

It should complain because `C.f` wasn't calling `M#f`.
This should pass verification:

``` ruby
module M
  extend Gitlab::Utils::Override

  override :f
  def f
    super.succ
  end
end

class B
  def self.f
    0
  end
end

class C < B
  extend M
end
```

Because `C.f` would now call `M#f`, and `M#f` does override something.

This currently causes 500's errors when loading the MR page
(Discussion) in a few scenarios.

We were not considering detailed diff headers such as
"--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md"
to crop the diff. In order to address it, we're now using
Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects
we can iterate and filter on.

Resolve "New project visibility level description alignment"

Closes #47147 and #46885

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