Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	app/views/groups/group_members/index.html.haml

[ci skip]

Refactor the Gemnasium import docs

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

Add 2FA filter to group members page

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

Add 2FA filter to group members page

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

Wiki Find Page to opt_out

Closes gitaly#894

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

Print the Git version for EE specific check

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

Resolve "[Rails5] Bump Rails5 to 5.0.7"

Closes #46234

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

Resolve "[Rails5] Fix `NoMethodError:  undefined method `-' for "3":String`"

Closes #46233

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

Resolve "[Rails5] Fix `Route source can't be blank`"

Closes #46228

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

Resolve "[Rails5] Fix app/views/groups/issues.html.haml"

Closes #46225

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

Support `js-close` as a removal class in UserCallout

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

CE upstream - 2018-05-11 09:35 UTC

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

Skip renaming column in EE when it was already created with the new name in CE

Closes gitlab-qa#240

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

Test Geo Node API

Closes gitlab-qa#131

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

Because we're highly depending on how Git works in those scripts
and we found the exact same script passed locally but not in CI?

https://gitlab.com/gitlab-org/gitlab-ee/issues/5960#note_72641299

Not that it must be Git version, but it would be nice if we could
have more debugging information.

Fixed none merge request files not being openable in the web IDE

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

Backport EE specific cluster spec changes to CE

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

Add missing tooltip to creation date on container registry overview

Closes #34229

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

Remove method call to deprecated method

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

Resolve "Extract EE specific files/lines for spec/models/clusters"

Closes #5911

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

Ensure runner_type is updated correctly when assigning shared runner to project

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

Resolve "Terms acceptance dropdown menu"

Closes #46210

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

Remove the incorrect "events behind" text in Geo admin screen

Closes #5827

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

Resolve "Move external link icon to end of link instead of front"

Closes #40725

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

Closes https://gitlab.com/gitlab-org/gitaly/issues/894

Add documentation for Runner Registration API

Closes #42067

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

CE: Helm init before helm repo add

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

Given the settings initializer creates Gitaly Storage Settings objects
already, the calls to path can be moved to that initializer.

Helm init before helm repo add

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

CE upstream - 2018-05-11 00:23 UTC

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

In Rails 5 the `per_page` argument came from `params` is String but an
Integer is expected.

This commit explicitly converts `per_page` to an Integer.
It fixes the errors like:

```
  1) Groups::ChildrenController GET #index for subgroups filtering children succeeds if multiple pages contain matching subgroups
     Failure/Error:
       hash[page] = second_collection.page(second_collection_page)
                      .per(per_page - paginated_first_collection(page).size)
                      .padding(offset)

     NoMethodError:
       undefined method `-' for "3":String
       Did you mean?  -@
     # ./lib/gitlab/multi_collection_paginator.rb:42:in `block in paginated_second_collection'
     # ./lib/gitlab/multi_collection_paginator.rb:46:in `paginated_second_collection'
     # ./lib/gitlab/multi_collection_paginator.rb:14:in `paginate'
     # ./app/finders/group_descendants_finder.rb:52:in `children'
     # ./app/finders/group_descendants_finder.rb:34:in `execute'
     # ./app/controllers/groups/children_controller.rb:36:in `setup_children'
     # ./app/controllers/groups/children_controller.rb:18:in `index'
     # ./lib/gitlab/i18n.rb:50:in `with_locale'
     # ./lib/gitlab/i18n.rb:56:in `with_user_locale'
     # ./app/controllers/application_controller.rb:351:in `set_locale'
     # ./spec/controllers/groups/children_controller_spec.rb:182:in `block (5 levels) in <top (required)>'
     # ./spec/spec_helper.rb:198:in `block (2 levels) in <top (required)>'
```

In Rails 5.0 automatic inverse does not work for polymorphic relathionships.
It was fixed in Rails 5.2: https://github.com/rails/rails/pull/28808

Until that the `inverse_of: :source` argument should be set explicitly.

Fixes the errors like:

```
ActionView::Template::Error:
  Attempting to generate a URL from non-sanitized request parameters! An attacker can inject malicious data into the generated URL, such as changing the host. Whitelist and sanitize passed parameters to be secure.
```