# Conflicts:
#	app/assets/javascripts/api.js
#	app/views/admin/dashboard/index.html.haml
#	locale/gitlab.pot
#	spec/javascripts/api_spec.js

[ci skip]

Use axios instead of jquery ajax for setCiStatusFavicon

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

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>

Stop rescuing Rugged::Reference in Repository cache

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

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

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

Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints

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

Gitaly Server info for admin panel

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

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

Introduce a new QA::Gitlab::Page::Component::Dropzone class

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

Move Repository#can_be_merged? to Gitlab::Git::Repository

Closes #42544

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

Fix not all events being shown in group dashboard

Closes #42560

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

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

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

Move the elastic specs into the `ee` folder

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

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

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

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

Closes #4635

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

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]

EE port of ph-ajax-to-axios

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

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

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.

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.

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

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

We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:

https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields

Relates to #42030

The group activity feed was limited to the first 20 projects found
in the group, which caused activity from some projects to be omitted.
A limit of 20 is applied to the query for events, so the
extra pagination does little in the way of performance.

Closes #42560

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