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

Closes gitaly#958 et gitaly#784

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

Resolve "Add Web IDE button to project page"

Closes #4613

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

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

Backport CE cardinality reduction to resolve influx_db.rb conflict in EE

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

Gitaly Server info for admin panel

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

Update epics index JSON response

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

Move the elastic specs into the `ee` folder

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

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

Closes #4635

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

EE port of ph-ajax-to-axios

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

spec/models/concerns/elastic -> spec/ee/spec/models/concerns/elastic

Implements the client side for gitlab-org/gitaly#819. Which is a server
info command. This checks the server version and git binairy version on
the server.

A small UI was added for administrators, so they can check the status of
the Gitaly server. This is done for each storage the monolith knows.

Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That
MR removed the Git version too, but didn't replace it with anything.

For JSON requests epics index page returns a JSON array of epics. This
will be used on epic roadmap page (#3559). Pagination is disabled in
this case - it's not supported for the first iteration on roadmap page.

Until now JSON response for epics index action returned an HTML list of
epics but it was not used anywhere in our code.

Related #3559

# 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