Merge branch '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master'

Fix incorrectly displayed conflict warning

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

Make it easier to find invited group members

Closes #61948

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

Resolve "GDK error on non-unique GraphQL fragment 'PageInfo'"

Closes #13330

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

[CE] FE fix diffs specs leaking store

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

Rename tfs.md to tfvc.md and update the doc

Closes #65747

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

Marcel Amirault authored 5 years ago and Achilleas Pipinellis committed 5 years ago

the tfs.md doc was actually about tfvc, so it was renamed
and content made more up to date, with light copy edits

Docs: Fix typo when enumerating GOSEC levels for SAST

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

Replace redirect_from with disqus_identifier in docs

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

Resolve "Keyboard shortcut for "jump to NEXT unresolved discussion""

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

Sam Bigelow authored 5 years ago and Paul Slaughter committed 5 years ago

Add keyboard shortcuts `p` and `n` to navigate duscussions.

Hide warning when update request is in progress

Remove test from quarantine

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

Fix introduced section in chatops doc

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

Add more rules to markdown lint check

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

Marcel Amirault authored 5 years ago and Evan Read committed 5 years ago

Adds MD010 (Hard tabs), MD012 (blank lines), MD029 (ordered
list prefix), MD030 (spaces after list markers), and fixes
remaining docs that were failing these tests

Bump nokogiri to 1.10.4

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

adding subgroups to docs

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

This pulls in fix for CVE-2019-5477, where usage of
Nokogiri::CSS::Tokenizer#load_file leads to potential command injection.

- Export mr_notes module as function
- Update specs refs of mr_notes/stores to factory

EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15097

Fix broken master: Update karma for new expansion cell markup

Closes gitlab-ee#13439

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

André Luís authored 5 years ago and Paul Slaughter committed 5 years ago

Also cleans up spec by:
- Add missing `afterEach ... $destroy`
- Add missing `done` call when `$nextTick` was used

Make clearer that memory team is working to reduce memory requirement

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

Emilie Schario authored 5 years ago and Achilleas Pipinellis committed 5 years ago

Make clearer that the memory team is working
to reduce the memory requirement

Update ffi gem to 1.11.1

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

This reduces duplication on Omnibus GitLab and saves about ~8 MB of disk
space.

Full list of changes:
https://github.com/ffi/ffi/blob/master/CHANGELOG.md

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14943

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

Resolve "Incrementally expand merge request diffs in both direction"

Closes #58035

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

- expand upwards
- expand downwards
- expand all

in both inline and parallel views

Split MR widget into etag-cached and non-cached serializers

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

Igor Drozdov authored 5 years ago and Douwe Maan committed 5 years ago

Splits auto-refreshing of MR widget into 2 requests:

- the one which uses etag-caching and invalidates the fields on change
- the one without caching

The idea is to gradually move all the fields to etag-cached endpoint

Backport EE code for OAuth applications spec

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

Prevent rewritting plain links as embedded

Closes #58494

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

Removed duplicate functions from utils.sh

Closes gitlab-ee#13336

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

Remove embed metrics feature flag

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

Removes the feature flag that controls whether
metrics dashboard urls unfurl the metrics dashboard
charts.