CE upstream - 2018-02-20 12:23 UTC

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

Refactor docs for creating projects under a group

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

Add version which LFS lock was introduced

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

Update docs on browser performance testing

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

Refactor the SAST docs

Closes #4954

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

# Conflicts:
#	config/webpack.config.js
#	features/steps/project/network_graph.rb

[ci skip]

Move more EE-specific to ee/

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

Run ee-files-location-check only for branches on .com

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

CE upstream - 2018-02-20 08:16 UTC

Closes gitlab-ce#25201

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

Move spinach project network graph tests to RSpec

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

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

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

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

Remove unecessary validate: true from belongs_to :project

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

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

Fixed by
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4203

- Rearrange to look like the DAST docs
- Replace with new SAST image

Remove graphs_show.js webpack bundle

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

EE port of "Remove graphs_show.js webpack bundle"

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

# Conflicts:
#	app/views/projects/settings/repository/show.html.haml
#	app/views/shared/issuable/_sidebar.html.haml
#	config/webpack.config.js

[ci skip]

CE upstream - 2018-02-19 18:23 UTC

Closes #4984, #4864, gitlab-qa#190, and gitlab-ce#40854

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

Resolve "Broken master: ee/spec/lib/gitlab/git_access_wiki_spec.rb and ee/spec/features/epics/epic_issues_spec.rb"

Closes #4984

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

This does not seem to serve any clear purpose and causes other issues (see https://gitlab.com/gitlab-org/gitlab-ce/issues/43196#note_59275652)

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

Remove extraneous tests from Issues API spec

Closes #25201

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

Update two links in the changelog developer docs

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