# Conflicts:
#	lib/gitlab/metrics/influx_db.rb

[ci skip]

Reduce the cardinality of GitLab metrics

Closes #41771

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

Contribution calendar label cutoff fix

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

Migrate fetching wiki page formatted content to Gitaly

Closes gitaly#958

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

Resolve "Move EE-only /lib files under top-level /ee directory"

Closes #3971

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

Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck

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

Resolve "Move EE-only /app files under top-level /ee directory"

Closes #3970

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

CE upstream - 2018-01-30 18:24 UTC

Closes gitlab-qa#154 and gitaly#969

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

Resolve "Update Nokogiri to 1.8.2"

Closes #42591

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

Migrate Git::Repository#write_ref to Gitaly

Closes gitaly#784

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

Login via OAuth marked as "external" should only mark new users as "external", not existing ones

Closes #21554

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

Merge branch '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master'

Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass"

Closes #42160

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

# Conflicts:
#	qa/qa/page/menu/admin.rb

[ci skip]

Speed-up the click on 'New subgroup' if the 'No results' text is shown

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

EE: Define QA selectors and remove EE only code

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

Define QA selectors and remove EE only code

Closes gitlab-qa#154

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

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

The conflicts are simple enought to resolve that we don't need to bother
developers with those.
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

Decouple more of Repository from Rugged

Closes gitaly#969

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

Closes gitaly#958

CE upstream - 2018-01-30 15:25 UTC

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

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

Improve UI in security reports

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

Make pagination optional for issuables

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

Include epics from subgroups

Closes #4301

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

Check MR state before submitting queries for discussion state

Closes #42236

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

It appears that some legacy diff notes on GitLab.com have invalid line codes,
which means truncated_diff_lines won't work. This is just a band-aid solution,
as neither the diff nor the discussion will display correctly for these notes,
but they won't cause a 500 error.

# Conflicts:
#   qa/qa/page/group/show.rb

# Conflicts:
#   qa/qa/page/group/show.rb

Port changes from gitlab-org/gitlab-ee!4064 to CE

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

Add Geo attachment replication QA spec

Closes gitlab-qa#128

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

On epics roadmap page we list all epics in the given time frame
without pagination (at least for the first iteration), in this
case it would be nice to use the existing issuables index logic
except pagination (see MR gitlab-ee!4281). For this reason this
patch allows to easily disable pagination.

Related gitlab-ee!4281

Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job

Closes #42569

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

More $.ajax conversions to axios

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