CE upstream - 2018-02-01 12:25 UTC

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

Resolve "Error 500 loading status of Geo primary node when replication lag is high"

Closes #4773

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix subgroup creation docs

Closes #42598

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

Resolve "Clarify the wording around CE to EE ports: backport/upport/upstream merge etc."

Closes #41710

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	lib/gitlab/upgrader.rb
#	spec/finders/group_projects_finder_spec.rb
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb

[ci skip]

View all issues of all subgroups on the group issue page

Closes #30106 and #39388

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

Backport: Include subgroup issuables on the group page

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

Allow to find epics by the given time frame

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

Enable Style/RegexpLiteral cop

Closes #42497

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

[EE] Enable RuboCop Style/RegexpLiteral

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

Remove namespaced internationalization import

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

# Conflicts:
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb

CE upstream - 2018-02-01 04:46 UTC

Closes omnibus-gitlab#3128

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

Closes gitlab-org/omnibus-gitlab#3128

CE upstream - 2018-02-01 00:23 UTC

Closes gitlab-qa#160

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

Add a QA scenario for creating an issue

Closes gitlab-qa#160

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

Replace $.ajax in find file with axios

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

Replace $.ajax in activity calendar with axios

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

Remove some Rugged dependencies from Repository

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

Remove Rugged::Walk implementation of #log

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

CE upstream - 2018-01-31 18:23 UTC

Closes #4761

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

Resolve "Remove geo-specific git version check"

Closes #4762

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