Commits · 54fdfdea607f5ca022cce9fce3edb4f564e0d020 · nexedi / gitlab-ce

07 Apr, 2020 9 commits
- Merge branch 'fj-replace-snippet-git-message' into 'master' · 54fdfdea
  Heinrich Lee Yu authored Apr 07, 2020
```
Update copy when snippet git feature disabled

See merge request gitlab-org/gitlab!28913
```
  54fdfdea
- Merge branch 'docs_foss-8' into 'master' · 75a0b932
  Marcel Amirault authored Apr 07, 2020
```
Docs: Fix foss-links

See merge request gitlab-org/gitlab!28921
```
  75a0b932
- Merge branch 'cablett-spam-test-refactor-2' into 'master' · b921bd2b
  Heinrich Lee Yu authored Apr 07, 2020
```
Small spam tidbits

See merge request gitlab-org/gitlab!28911
```
  b921bd2b
- Merge branch '118841_06-cleanup' into 'master' · 8fc3e503
  Michael Kozono authored Apr 07, 2020
```
Remove `enable_geo_node_form_js` feature flag

Closes #118841

See merge request gitlab-org/gitlab!27931
```
  8fc3e503
- Merge branch 'mk/clarify-reset-tracking-db-in-ha' into 'master' · 8a2f29dd
  Evan Read authored Apr 07, 2020
```
Geo: Clarify how to reset tracking DB in HA

See merge request gitlab-org/gitlab!28981
```
  8a2f29dd
- Merge branch '213062-disallow-distinct-count-for-the-ordinary-batch-counter' into 'master' · 96124d11
  Tiger Watson authored Apr 07, 2020
```
Disallow distinct count for regular batch count

See merge request gitlab-org/gitlab!28518
```
  96124d11
- Merge branch 'revert-c0d092b9' into 'master' · 530460ff
  Robert Speicher authored Apr 07, 2020
```
Revert "Merge branch '32737-make-mergeservice-idempotent' into 'master'"

See merge request gitlab-org/gitlab!28979
```
  530460ff
- Merge branch '213163-docs-aqualls-split' into 'master' · ed174f65
  Evan Read authored Apr 07, 2020
```
Split AutoDevops stages to child page

See merge request gitlab-org/gitlab!28820
```
  ed174f65
- Move stage information to separate page · eb8069d5
  Amy Qualls authored Apr 07, 2020
```
Split out the stages to a separate page to begin shortening the
AutoDevops page.
```
  eb8069d5
06 Apr, 2020 31 commits
- Revert "Merge branch '32737-make-mergeservice-idempotent' into 'master'" · c58a8595
  Mayra Cabrera authored Apr 06, 2020
```
This reverts merge request !24708
```
  c58a8595
- Merge branch 'normalize-import-error-messages' into 'master' · 24f58684
  Mayra Cabrera authored Apr 06, 2020
```
Normalize error message between Gitea and Fogbugz importers

See merge request gitlab-org/gitlab!28802
```
  24f58684
- Merge branch 'normalize-import-error-messages' into 'master' · 874bacae
  Mayra Cabrera authored Apr 06, 2020
```
Normalize error message between Gitea and Fogbugz importers

See merge request gitlab-org/gitlab!28802
```
  874bacae
- Merge branch 'normalize-import-error-messages' into 'master' · a28bc420
  Mayra Cabrera authored Apr 06, 2020
```
Normalize error message between Gitea and Fogbugz importers

See merge request gitlab-org/gitlab!28802
```
  a28bc420
- Merge branch 'normalize-import-error-messages' into 'master' · 6f978944
  Mayra Cabrera authored Apr 06, 2020
```
Normalize error message between Gitea and Fogbugz importers

See merge request gitlab-org/gitlab!28802
```
  6f978944
- Merge branch '212704-fix-jira-graphql-key' into 'master' · d268d4c0
  Mayra Cabrera authored Apr 06, 2020
```
Check if jira project key has been provided

See merge request gitlab-org/gitlab!28750
```
  d268d4c0
- Merge branch '212704-fix-jira-graphql-key' into 'master' · db80888e
  Mayra Cabrera authored Apr 06, 2020
```
Check if jira project key has been provided

See merge request gitlab-org/gitlab!28750
```
  db80888e
- Merge branch '212704-fix-jira-graphql-key' into 'master' · 31462dd0
  Mayra Cabrera authored Apr 06, 2020
```
Check if jira project key has been provided

See merge request gitlab-org/gitlab!28750
```
  31462dd0
- Merge branch '212704-fix-jira-graphql-key' into 'master' · 8bf64434
  Mayra Cabrera authored Apr 06, 2020
```
Check if jira project key has been provided

See merge request gitlab-org/gitlab!28750
```
  8bf64434
- Merge branch '34118-add-fallback-method-of-generating-paths-for-codeowner-entries' into 'master' · 6a1db320
  Robert Speicher authored Apr 06, 2020
```
Add fallback path lookup for large MRs

Closes #34118

See merge request gitlab-org/gitlab!28842
```
  6a1db320
- Merge branch '34118-add-fallback-method-of-generating-paths-for-codeowner-entries' into 'master' · ef0eb560
  Robert Speicher authored Apr 06, 2020
```
Add fallback path lookup for large MRs

Closes #34118

See merge request gitlab-org/gitlab!28842
```
  ef0eb560
- Merge branch '34118-add-fallback-method-of-generating-paths-for-codeowner-entries' into 'master' · ff43aa2b
  Robert Speicher authored Apr 06, 2020
```
Add fallback path lookup for large MRs

Closes #34118

See merge request gitlab-org/gitlab!28842
```
  ff43aa2b
- Merge branch '34118-add-fallback-method-of-generating-paths-for-codeowner-entries' into 'master' · 845e41aa
  Robert Speicher authored Apr 06, 2020
```
Add fallback path lookup for large MRs

Closes #34118

See merge request gitlab-org/gitlab!28842
```
  845e41aa
- Merge branch 'add-migration-output-for-up-and-down' into 'master' · a477f8b7
  Mayra Cabrera authored Apr 06, 2020
```
Update doc to add migration output for up and down

See merge request gitlab-org/gitlab!28903
```
  a477f8b7
- Merge branch 'add-migration-output-for-up-and-down' into 'master' · 6688e87e
  Mayra Cabrera authored Apr 06, 2020
```
Update doc to add migration output for up and down

See merge request gitlab-org/gitlab!28903
```
  6688e87e
- Merge branch 'add-migration-output-for-up-and-down' into 'master' · 6b99db33
  Mayra Cabrera authored Apr 06, 2020
```
Update doc to add migration output for up and down

See merge request gitlab-org/gitlab!28903
```
  6b99db33
- Merge branch 'add-migration-output-for-up-and-down' into 'master' · ae3a0a36
  Mayra Cabrera authored Apr 06, 2020
```
Update doc to add migration output for up and down

See merge request gitlab-org/gitlab!28903
```
  ae3a0a36
- Update doc to add migration output for up and down · 6e0b29e6
  Alper Akgun authored Apr 06, 2020
  
  6e0b29e6
- Merge branch 'selhorn-docstructure' into 'master' · 68617d4e
  Evan Read authored Apr 06, 2020
```
Docs style update to remove Overview heading

See merge request gitlab-org/gitlab!28828
```
  68617d4e
- Docs style update to remove Overview heading · f97d8a8a
  Suzanne Selhorn authored Apr 06, 2020
  
  f97d8a8a
- Really should use ||= assignment · 16176fcb
  Kerri Miller authored Apr 06, 2020
  
  16176fcb
- Rely on #overflow? for determining oversized MR · 2671dd85
  Kerri Miller authored Apr 06, 2020
  
  2671dd85
- Small spam tidbits · 5968a3a5
  charlieablett authored Apr 06, 2020
```
- Fix some typos
- One-line fixes to tighten up tests
```
  5968a3a5
- Merge branch 'docs-scim-update' into 'master' · 8127a62d
  Mike Jang authored Apr 06, 2020
```
Docs: Update Azure SCIM map to externalId

Closes #212733

See merge request gitlab-org/gitlab!28464
```
  8127a62d
- Docs: Update Azure SCIM map to externalId · a66a7f32
  Cynthia Ng authored Apr 06, 2020
  
  a66a7f32
- Merge branch '209867-snippet-size' into 'master' · 636755cf
  Douglas Barbosa Alexandre authored Apr 06, 2020
```
Check and limit snippet repo size

See merge request gitlab-org/gitlab!27389
```
  636755cf
- Extract fast_ and slow_path_lookup · b4c07c00
  Kerri Miller authored Apr 06, 2020
```
Make explicit the expected performance difference between these two
different methods of getting at merge request path information, and
add/improve specs
```
  b4c07c00
- Merge branch '207409-status-page-usage-ping' into 'master' · c19a273b
  Peter Leitzen authored Apr 06, 2020
```
Status Page Usage Ping

See merge request gitlab-org/gitlab!28002
```
  c19a273b
- Reformat usage data for shorter lines · ca854a2d
  Allison Browne authored Apr 06, 2020
```
Change whitespace to allow for shorter lines
to increase readability
```
  ca854a2d
- Clarify resetting tracking DB in HA · c08586dd
  Michael Kozono authored Apr 06, 2020
  
  c08586dd
- Merge branch 'user-post-diff-notes' into 'master' · af2bc548
  Peter Leitzen authored Apr 06, 2020
```
Remove duplicate spec in user post diff notes

See merge request gitlab-org/gitlab!28859
```
  af2bc548