CE upstream - 2018-05-03 13:09 UTC

Closes gitaly#1146

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

Refactor the Geo LogCursor Logger to make class more descriptive

Closes #5632

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970

Fix typo in external authorization URL help text

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

# Conflicts:
#	app/models/identity.rb
#	doc/topics/autodevops/index.md

[ci skip]

CE upstream - 2018-05-02 18:27 UTC

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

To make the source class more descriptive, i.e. including all the
parent module names, the Logger used by the Geo LogCursor is
refactored to be a class. The caller should instantiate it and pass it
it's class so the logger can extract it's name.

Closes gitlab-org/gitlab-ee#5632.

Platform: Use component to emit event on Subscription toggle component instead of eventHub

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

This used to use two faked storages, and to work around the that fact it
disabled the wikis and just tested if methods were called. Now this
tests the effects of the method calls and enables Gitaly again.

Resolve "`include` not working"

Closes #5078

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

update devise 4.2 -> 4.4

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

[Rails5] Fix trusted proxies

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

CE port of "Remove `features/group_active_tab.feature`"

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

Remove `features/group_active_tab.feature`

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

The expected values for the recursive merge specs were missing
"variables" at the top level.

Modify the changelog title to focus on the feature being added, not how
it's implemented (deep merging).

Recursive merging does not extend lists. Add a blurb in the ci/yaml
docs about this.

Rework the section about include in the ci/yaml docs to describe
recursive merges. Also add a note that in prior releases of GitLab, the
.gitlab-ci.yml took strict precedence over includes.

When both external files and gitlab_ci.yml define a dictionary of
variables where some variable keys overlap, later declarations should
take precedence.

When both external files and gitlab_ci.yml define a dictionary of
distinct variables, they should be merged together.

When combining GitLab CI YAML content, use deep_merge instead of merge
to combine external files and the inline content. This merges the
external files and inline content recursively, providing more options
for customizing jobs loaded from external files.

Update group menu position based on 10.x UI changes.

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

CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5554

There is a bug in trusted proxies: https://github.com/rails/rails/issues/5223
This commit adds a monkey patch to fix the bug.

Example of errors:

```
1) trusted_proxies with default config preserves private IPs
    Failure/Error: expect(request.ip).to eq('10.1.5.89')

      expected: "10.1.5.89"
          got: nil

      (compared using ==)
    # ./spec/initializers/trusted_proxies_spec.rb:12:in `block (3 levels) in <top (required)>'

2) trusted_proxies with default config filters out localhost
    Failure/Error: expect(request.ip).to eq('10.1.5.89')

      expected: "10.1.5.89"
          got: "1.1.1.1"

      (compared using ==)
    # ./spec/initializers/trusted_proxies_spec.rb:18:in `block (3 levels) in <top (required)>'
```