Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job

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

Resolve "mysql-only installation from source broken: Gem::LoadError: pg is not part of the bundle"

Closes #42239

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

Unify and split CE/EE for spec/requests/api/jobs_spec.rb

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

Add note about needing to be in the `$gdk/gitlab/qa` directory for `bin/qa` to work properly

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

[ci skip]

Converted $.ajax calls in some JS files to axios

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

Document format parameter for Repository Archive endpoint

Closes #42499

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

I ran into some issues when trying it out
https://gitlab.slack.com/archives/C3JJET4Q6/p1517384135000134

Add support for PreReceiveError in UserMergeBranch RPC

Closes gitaly#979

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

Migrate Git::Repository#delete_refs to Gitaly

Closes gitaly#967

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

Closes gitaly#979

Closes gitaly#967

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

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

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

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

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

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

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>

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>

Decouple more of Repository from Rugged

Closes gitaly#969

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

Closes gitaly#958

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

Make pagination optional for issuables

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

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

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

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