Commits · aa0dd496934dbba4574fa7933d40428a0fe85ba7 · nexedi / gitlab-ce

29 Feb, 2020 17 commits
- Merge branch 'gy-ha-docs-cleanup' into 'master' · aa0dd496
  Mike Lewis authored Feb 29, 2020
```
Cleanup Scaling / HA docs page

Closes #205634, #205632, and #205635

See merge request gitlab-org/gitlab!25422
```
  aa0dd496
- Minor edits to scaling and HA readme · 9ae21b39
  Mike Lewis authored Feb 29, 2020
  
  9ae21b39
- Minor edits to Gitaly doc · 534d3d7b
  Mike Lewis authored Feb 29, 2020
  
  534d3d7b
- Merge branch 'kassio-fix-dev-seed' into 'master' · fecff5e3
  Stan Hu authored Feb 29, 2020
```
Fix dev vulnerabilities seeder

See merge request gitlab-org/gitlab!26169
```
  fecff5e3
- Merge branch 'revert-e80446f0' into 'master' · 5ee3d7bd
  Heinrich Lee Yu authored Feb 29, 2020
```
Revert "Merge branch 'craigf/job-args-json-escape' into 'master'"

Closes #208501

See merge request gitlab-org/gitlab!26210
```
  5ee3d7bd
- Revert "Merge branch 'craigf/job-args-json-escape' into 'master'" · f35d0e75
  Stan Hu authored Feb 29, 2020
```
This reverts merge request !26075
```
  f35d0e75
- Merge branch 'mwaw/make_projects_operations_update_service_specs_dynamic' into 'master' · b7c5b24e
  Heinrich Lee Yu authored Feb 29, 2020
```
Make operations/update_service_spec.rb dynamic

See merge request gitlab-org/gitlab!25253
```
  b7c5b24e
- Merge branch 'docs-aqualls-user-codeblocks' into 'master' · 70c362cf
  Marcel Amirault authored Feb 29, 2020
```
Docs: add language declarations to code blocks

See merge request gitlab-org/gitlab!26206
```
  70c362cf
- Add language declarations to various code blocks · a2564e0c
  Amy Qualls authored Feb 29, 2020
```
This MR adds language declarations to several pages in the /user
subdirectory.
```
  a2564e0c
- Merge branch 'docs-aqualls-api-codeblocks-2' into 'master' · 81ea8c44
  Marcel Amirault authored Feb 29, 2020
```
Docs: add language declarations to code blocks

See merge request gitlab-org/gitlab!26204
```
  81ea8c44
- Merge branch 'docs-aqualls-api-codeblocks' into 'master' · a81dda45
  Marcel Amirault authored Feb 29, 2020
```
Add language declarations to code blocks

See merge request gitlab-org/gitlab!26203
```
  a81dda45
- Merge branch 'sh-disable-line-in-marginalia' into 'master' · 34393d6a
  Mayra Cabrera authored Feb 29, 2020
```
Disable Marginalia line backtrace in production

See merge request gitlab-org/gitlab!26199
```
  34393d6a
- Merge branch 'mjang-inline-html' into 'master' · 16e2fe30
  Marcel Amirault authored Feb 29, 2020
```
HTML tags don't always work

See merge request gitlab-org/gitlab!26177
```
  16e2fe30
- HTML tags don't always work · 94d34543
  Mike Jang authored Feb 29, 2020
  
  94d34543
- Merge branch '202639' into 'master' · 706d0904
  Paul Slaughter authored Feb 29, 2020
```
Update diff line content on MR diffs to use actual HTML and not CSS element

See merge request gitlab-org/gitlab!24815
```
  706d0904
- Replace line diff number css selector with actual HTML inside MRs · ea829ef0
  David O'Regan authored Feb 29, 2020
```
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24815
```
  ea829ef0
- Merge branch 'saml-shot' into 'master' · 08620fc5
  Lyle Kozloff authored Feb 29, 2020
```
Update basic SAML Azure screenshot

See merge request gitlab-org/gitlab!26192
```
  08620fc5
28 Feb, 2020 23 commits
- Merge branch '201771' into 'master' · 15643416
  Paul Slaughter authored Feb 28, 2020
```
Fix `setTimeout` references in `content_viewer_spec`

See merge request gitlab-org/gitlab!24897
```
  15643416
- Fix `setTimeout` references in `content_viewer_spec` · d59d1ff2
  David O'Regan authored Feb 28, 2020
```
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24897
```
  d59d1ff2
- Add language declarations to code blocks · 6685146b
  Amy Qualls authored Feb 28, 2020
```
Adding code language declarations to the last round of files in
the API folder.
```
  6685146b
- Add language declarations to code blocks · bf402238
  Amy Qualls authored Feb 28, 2020
```
This commit adds more language declarations to code blocks in
the API documentation.
```
  bf402238
- Merge branch 'craigf/job-args-json-escape' into 'master' · e80446f0
  Mayra Cabrera authored Feb 28, 2020
```
Stringify sidekiq job args in logs

See merge request gitlab-org/gitlab!26075
```
  e80446f0
- Merge branch '196455-move-ca-to-the-group-level' into 'master' · 9f409f75
  Stan Hu authored Feb 28, 2020
```
Move top-level Cycle Analytics to the group level

See merge request gitlab-org/gitlab!24773
```
  9f409f75
- Merge branch 'cablett-mail-room-fork' into 'master' · 25411943
  Stan Hu authored Feb 28, 2020
```
Use new mail_room fork

See merge request gitlab-org/gitlab!25869
```
  25411943
- Disable Marginalia line backtrace in production · c4dc7833
  Stan Hu authored Feb 28, 2020
```
As mentioned in https://github.com/basecamp/marginalia/pull/93/files,
adding `:line` to the output of the Marginalia incurs some overhead
because a regexp on the backtrace has to be run on every SQL query. Only
enable this in development because we've seen it slow things down.

Identified in https://gitlab.com/gitlab-org/gitlab/issues/198694
```
  c4dc7833
- Add --log-exit-as arg · 12f8583e
  charlieablett authored Feb 26, 2020
```
Logs exit as JSON, then exits rather than simply crashing out
```
  12f8583e
- Merge branch '207976-stop-markdown-caching-of-non-markdown-snippet-content' into 'master' · 10600bb0
  Douglas Barbosa Alexandre authored Feb 28, 2020
```
Resolve "Stop markdown caching of non-markdown Snippet content"

Closes #207976

See merge request gitlab-org/gitlab!25985
```
  10600bb0
- Merge branch '194291-move-related-issues-to-jest' into 'master' · 88648d16
  Natalia Tepluhina authored Feb 28, 2020
```
Migrate ee/spec/javascripts/issuable/components to Jest

See merge request gitlab-org/gitlab!26091
```
  88648d16
- Move some ee/related_issues/components specs to Jest · 5d6ba33f
  Paul Slaughter authored Feb 28, 2020
```
- Also moves the related_issuable_mock_data
```
  5d6ba33f
- Merge branch 'sh-cache-ci-variables' into 'master' · 7a66e12c
  Mayra Cabrera authored Feb 28, 2020
```
Memoize loading of CI variables

See merge request gitlab-org/gitlab!26147
```
  7a66e12c
- Update basic SAML Azure screenshot · ae0f3ed0
  Cynthia Arty Ng authored Feb 28, 2020
  
  ae0f3ed0
- Merge branch '194218-migrate-spec-javascripts-blob_edit-to-jest' into 'master' · 4c331c26
  Martin Wortschack authored Feb 28, 2020
```
Migrate blob_bundle spec from Karma to Jest

Closes #194218

See merge request gitlab-org/gitlab!26134
```
  4c331c26
- Merge branch 'fix-dependency-proxy-link' into 'master' · 210ecd43
  Paul Slaughter authored Feb 28, 2020
```
Replace placeholder link on dependency proxy page

See merge request gitlab-org/gitlab!26092
```
  210ecd43
- Replace placeholder link on dependency proxy page · 25b636e1
  Steve Abrams authored Feb 28, 2020
```
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26092
```
  25b636e1
- Merge branch 'mk/hide-secondary-only-setting' into 'master' · 08527170
  Martin Wortschack authored Feb 28, 2020
```
Geo: Show secondary-only setting on only on secondaries

See merge request gitlab-org/gitlab!26029
```
  08527170
- Merge branch 'move-add-an-app' into 'master' · d719154c
  Mike Lewis authored Feb 28, 2020
```
Move interest in contributing an app to the end of the app list

See merge request gitlab-org/gitlab!26180
```
  d719154c
- Implement sentence case for title per style guide · 838b2f37
  Mike Lewis authored Feb 28, 2020
  
  838b2f37
- Merge branch 'renovate/gitlab-packages' into 'master' · 028a573f
  Martin Wortschack authored Feb 28, 2020
```
Update GitLab Packages

See merge request gitlab-org/gitlab!26175
```
  028a573f
- Merge branch '199134-update-security-badges' into 'master' · d93f21d9
  Mark Florian authored Feb 28, 2020
```
199134 - Update severity badges

See merge request gitlab-org/gitlab!25489
```
  d93f21d9
- Update to new severity badge design · c9e0609d
  Neil McCorrison authored Feb 28, 2020
```
https://gitlab.com/gitlab-org/gitlab/issues/199134
```
  c9e0609d