# Conflicts:
#	doc/README.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/web_ide/index.md
#	locale/gitlab.pot

[ci skip]

Docs: add product badges to docs

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

Docs: update Web IDE > CE (10.7)

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

Docs: add product badges to docs

Closes #42631

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

Geo: add extra reconfigure step in docs to enable FDW

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

Move Gitaly RefExists check to OPT_OUT

Closes gitaly#401

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

CE upstream - 2018-04-17 00:24 UTC

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

add initial dev task template for working on a security issue

Closes gitlab-org/release/docs#9

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

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

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

Docs: update Web IDE > CE (10.7)

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

Update to Git 2.16.3 in doc/install/installation.md

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

Add QA tests for protected branches

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

Ignore `locale/gitlab.pot` in ee_compat_check

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

Remove ambiguity when forking a project to a user's namespace

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

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

ReadyToMergeState needs to be loaded before mrWidgetOptions in app/assets/javascripts/vue_merge_request_widget/dependencies.js
Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve "Improve wording / copy for running a pipeline"

Closes #21677

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

Add .org? method to Gitlab helper

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

Consider dev.gitlab.org for initializing deprecation of Gitlab::GitalyClient::StorageSettings

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

Resolve "Collapsed diff spacing wrong when failed to load"

Closes #45271 and #45317

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

Fixed loading state not showing in IDE tree list

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

Merge branch '45363-optional-params-on-api-endpoint-produce-invalid-pagination-header-links' into 'master'

Fix URLs in the `Link` header for `GET /projects/:id/repository/contributors`   when no value is passed for `order_by` or `sort`

Closes #45363

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

# Conflicts:
#   doc/user/project/index.md