# Conflicts:
#	lib/gitlab/git_access.rb
#	spec/lib/gitlab/git_access_spec.rb

[ci skip]

Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master'

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

Fix: API Documentation typo on Microsoft Teams slug

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

Fix: API Documentation typo on Microsoft Teams slug

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

Enforce terms acceptance before configuring 2FA

Closes #46256

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

[EE] Block access to API & git when terms are enforced

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

Block access to API & git when terms are enforced

Closes #45849

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

Vendor Auto DevOps template

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

Resolve "Remove modal box confirmation when retrying a pipeline"

Closes #45715

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

CE upstream - 2018-05-11 12:30 UTC

Closes gitaly#894

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

Remove Gitlab::RepoPath.strip_storage_path

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

Allow builds that have been triggered by a user before terms were
enforced access to git. That way the builds can complete as usual.

Allow builds that have been triggered by a user before terms were
enforced access to git. That way the builds can complete as usual.

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

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

[ci skip]

This prevents a redirect loop when a user has to enable 2FA and accept
the terms.

Now they will need to accept the terms, then enable 2FA, or any other requirements.

Refactor the Gemnasium import docs

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

This used to be executed because of the post receive worker, but this
uses Gitlab::GlRepository.parse now. So this removes dead code and
reduces the number of calls on `#legacy_storage_path`.

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

The `access_git` and `access_api` were currently never checked for
anonymous users. And they would also be allowed access:

  An anonymous user can clone and pull from a public repo

  An anonymous user can request public information from the API

So the policy didn't actually reflect what we were enforcing.

When terms are enforced, but the user has not accepted the terms
access to the API & git is rejected with a message directing the user
to the web app to accept the terms.