Rename ambiguous association names in Ci::Pipeline

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

Add gitlab ui visual test

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

Update Health Check typo & adjust formatting

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

docs: ldap users must have email address set

Closes #40071

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

fix it ok

Fix

head pipeline

Expose additional merge request pipeline variables

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

Conflicts:
  doc/ci/variables/README.md
  spec/models/ci/pipeline_spec.rb

commit page info-well overflow fix #56436

Closes #56436

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

sidekiq: terminate child processes at shutdown

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

Quarantine git protocol v2 tests

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

Removes EE differences from ci_icon.vue

Closes gitlab-ee#10084

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

Sidekiq jobs frequently spawn long-lived child processes to do work.
In some circumstances, these can be reparented to init when sidekiq is
terminated, leading to duplication of work and strange concurrency
problems.

This commit changes sidekiq so that, if run as a process group leader,
it will forward `INT` and `TERM` signals to the whole process group. If
the memory killer is active, it will also use the process group when
resorting to `kill -9` to shut down.

These changes mean that a naive `kill <pid-of-sidekiq>` will now do the
right thing, killing any child processes spawned by sidekiq, as long as
the process supervisor placed it in its own process group.

If sidekiq isn't a process group leader, this new code is skipped.

De-quarantine project activity test

Closes gitlab-org/quality/staging#21

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

Adjusted a few different areas per Evan R's suggestions within the open
MR for this branch.

Types::BaseField accepts authorize after reload

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

Update Gitaly docs now NFS isn't required anymore

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

CE Add error string formatter for stylelint

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

Resolve some Rake task differences

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

Resolve "Move files in the Web IDE"

Closes #49397

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

- fixed test spec
- added warning only if file is deleted

CE backport of issuable-ee-differences

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

Merge branch '37673-minor-issue-with-apostrophe-single-quote-when-clicking-assign-to-me' into 'master'

Fix escape name in assignYourself

Closes #37673

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

Add spec for assigning user with apostrophe in name

CE backport of batch-comments-ee-store-module

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

Use factory method for import_projects store

Closes gitlab-ee#10062

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

Moves EE diferences to CE for mr_widget_pipeline

Closes gitlab-ee#10021

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

When working on files in `app/graphql` the code correctly gets
autoloaded.

However, the redefined `Types::BaseField` would never receive the
`.accepts_definition` call, causing all queries after a reload to
fail. Calling `.accepts_definition` on its superclass makes sure the
reloaded version also has the `authorize` definition specified.

Bring back Rugged implementation of find_commit

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

[CE Backport] Show commands applied message when promoting issues to epics

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

Fix 'commands applied' messages not being shown when issue is promoted to epic
using slash commands.

Allow to recursively expand includes

Closes #55937 and #56836

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