提交 · main-jh · gitlab-cn / GitLab

该项目从 https://gitlab.com/gitlab-org/gitlab.git 镜像。拉取镜像更新于 1月 30, 2023。

29 1月, 2023 6 次提交
- Merge branch 'Fix_job_6190538_and_6190514' into 'main-jh' · 160c57f4
  由 Martin Tan 创作于 1月 29, 2023
```
Fix job 6190538 and 619051

See merge request !1305
```
  160c57f4
- Fix job 6190538 and 619051 · 871b7853
  奇廷陈创作于 1月 29, 2023 ，Martin Tan 提交于 1月 29, 2023
  
  871b7853
- Merge branch 'fix-users-feature-category' into 'main-jh' · d729d8bf
  由 Dave Liu(Wenju) 创作于 1月 29, 2023
```
Fix users feature category

See merge request !1303
```
  d729d8bf
- Merge branch 'Fix_jobs_6182772' into 'main-jh' · 106052d4
  由 Dave Liu(Wenju) 创作于 1月 29, 2023
```
Fix job 6182772

See merge request !1304
```
  106052d4
- Fix job 6182772 · 25ca0ac8
  由奇廷陈创作于 1月 29, 2023
  
  25ca0ac8
- Fix users feature category · f739810a
  由 Linjie Zhang 创作于 1月 29, 2023
  
  f739810a
27 1月, 2023 34 次提交

Merge remote-tracking branch 'origin/master' into main-jh · a04dc35c
由 JH_SYNC_TOKEN 创作于 1月 27, 2023

a04dc35c

Merge branch '387728-add-state-validation-for-addon-purchase-flow' into 'master' · 5544eae1

由 Natalia Tepluhina 创作于 1月 27, 2023

Add state validation in addon purchase flow

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109715



Merged-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Approved-by: Diana Zubova <dzubova@gitlab.com>
Approved-by: Fiona Neill <fneill@gitlab.com>
Approved-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Co-authored-by: Vamsi Vempati <vvempati@gitlab.com>
Co-authored-by: Diana Zubova <dzubova@gitlab.com>

5544eae1

Add state validation in addon purchase flow · 6713eef5
由 Vamsi Vempati 创作于 1月 27, 2023
```
- Moved constants to constant files
- Updated tests for new validation

Changelog: changed
EE: true
```
6713eef5

Merge branch 'fix-application_security-doc' into 'master' · 1ff7fc98

由 Kati Paizee 创作于 1月 27, 2023

Fix Vale issues for user/application_security/index.md

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110358



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Somasree <bishnupadamajumder32@gmail.com>

1ff7fc98

Fix Vale issues for user/application_security/index.md · 437ebe77
由 SOMASREE MAJUMDER 创作于 1月 27, 2023

437ebe77

Merge branch 'fix-ci-build-foreign-key' into 'master' · 0a2a0604

由 Marius Bobin 创作于 1月 27, 2023

Add explicit foreign key to security scans

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110335



Merged-by: Marius Bobin <mbobin@gitlab.com>
Approved-by: Marius Bobin <mbobin@gitlab.com>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

0a2a0604

Merge branch 'yash240408-master-patch-74038' into 'master' · f5609738

由 Kati Paizee 创作于 1月 27, 2023

Update group_iterations.md

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110146



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Yash Mistry <yash.mistry.g43@gmail.com>

f5609738

Update group_iterations.md · b9c6adc7
由 Yash Mistry 创作于 1月 27, 2023

b9c6adc7

Merge branch 'drcatherinepope-master-patch-88298' into 'master' · 1d3190e7

由 Kati Paizee 创作于 1月 27, 2023

Update spelling-exceptions.txt for Observability

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110354



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Catherine Pope <cpope@gitlab.com>

1d3190e7

Update spelling-exceptions.txt for Observability · c9c8fc99
由 Catherine Pope 创作于 1月 27, 2023

c9c8fc99

Merge branch 'alejguer-master-patch-94166' into 'master' · 20803877

由 Marcel Amirault 创作于 1月 27, 2023

Advise to use custom trust policy for AWS OIDC

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103981



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Reviewed-by: Joe Randazzo <jrandazzo@gitlab.com>
Co-authored-by: Joe Randazzo <jrandazzo@gitlab.com>
Co-authored-by: Alejandro Guerrero <argdealba@gitlab.com>

20803877

Advise to use custom trust policy for AWS OIDC · 5d4db249
由 Alejandro Guerrero 创作于 1月 27, 2023

5d4db249

Merge branch 'fix-compile-production-assets' into 'master' · 03721699

由 Rémy Coutable 创作于 1月 27, 2023

Set ENV var for CI jobs that run in production env

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110343



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Albert Salim <asalim@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

03721699

Set ENV var to allow CI jobs to run decomposed · 0fc8e405

由 Heinrich Lee Yu 创作于 1月 27, 2023

We run CI with decomposed databases so we need to set this env var to
bypass our safety checks when some jobs run in production mode

0fc8e405

Merge remote-tracking branch 'origin/master' into main-jh · 8a91fa2f
由 JH_SYNC_TOKEN 创作于 1月 27, 2023

8a91fa2f

Merge branch 'russell/move-npm-footnote' into 'master' · ae66f1ce

由 Jon Glassman 创作于 1月 27, 2023

Improve npm footnote

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110325



Merged-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Adam Cohen <acohen@gitlab.com>
Co-authored-by: Russell Dickenson <rdickenson@gitlab.com>

ae66f1ce

Improve npm footnote · 557f725f
由 Russell Dickenson 创作于 1月 27, 2023

557f725f

Merge branch 'master-patch-5e74' into 'master' · 29174511

由 Jon Glassman 创作于 1月 27, 2023

Note for users to use friendly group names over object IDs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110123



Merged-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Jordan NG <jordanng@gitlab.com>

29174511

Note for users to use friendly group names over object IDs · 52aa3dbf
由 Jordan NG 创作于 1月 27, 2023

52aa3dbf

Merge branch 'daelmo-improve-upgrade-word-description-in-word-list-docs' into 'master' · 42e5ebc2

由 Achilleas Pipinellis 创作于 1月 27, 2023

Improve clarity in upgrade word description in word list docs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110307



Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: David Elizondo <daelmo@gmail.com>

42e5ebc2

Merge branch '383545-refactor-mr-security-reports-file' into 'master' · f51cabd4

由 David Pisek 创作于 1月 27, 2023

Abstract repeatedly used logic into functions

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110054



Merged-by: David Pisek <dpisek@gitlab.com>
Approved-by: Samantha Ming <sming@gitlab.com>
Approved-by: David Pisek <dpisek@gitlab.com>
Reviewed-by: Savas Vedova <svedova@gitlab.com>
Co-authored-by: Savas Vedova <svedova@gitlab.com>

f51cabd4

Merge branch 'docs-formatting' into 'master' · 5636320e

由 Lorena Ciutacu 创作于 1月 27, 2023

Add attribute formatting

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110323



Merged-by: Lorena Ciutacu <lciutacu@gitlab.com>
Approved-by: Lorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: Ben Bodenmiller <bbodenmiller@gmail.com>

5636320e

Merge branch '387414-fix-vale-issues-install-requirements' into 'master' · cd965a18

由 Kati Paizee 创作于 1月 27, 2023

Fixing Vale issues

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110326



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Claromes <claromes@hey.com>

cd965a18

Fixing Vale issues · b62924f1
由 claromes 创作于 1月 27, 2023

b62924f1

Merge branch 'arnvgl-master-patch-50348' into 'master' · 77f3e7b4

由 Lorena Ciutacu 创作于 1月 27, 2023

Vale fixes for value_stream_analytics_aggregated_backend.md

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110299



Merged-by: Lorena Ciutacu <lciutacu@gitlab.com>
Approved-by: Lorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: Arnav Goel <arnavgoel7903@gmail.com>

77f3e7b4

Vale fixes for value_stream_analytics_aggregated_backend.md · 25de61eb
由 Arnav Goel 创作于 1月 27, 2023

25de61eb

Merge branch 'cngo-extract-widget-wrapper' into 'master' · c1bc5aa1

由 Kushal Pandya 创作于 1月 27, 2023

Extract widget wrapper UI to separate Vue component

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110062



Merged-by: Kushal Pandya <kushalspandya@gmail.com>
Approved-by: Dheeraj Joshi <djoshi@gitlab.com>
Approved-by: Kushal Pandya <kushalspandya@gmail.com>
Reviewed-by: Coung Ngo <cngo@gitlab.com>
Co-authored-by: Coung Ngo <cngo@gitlab.com>

c1bc5aa1

Merge branch 'secure-files-ui-metadata' into 'master' · be385ed0

由 Kushal Pandya 创作于 1月 27, 2023

Adding Secure Files Metadata Modal to settings page

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104162



Merged-by: Kushal Pandya <kushalspandya@gmail.com>
Approved-by: Veethika M <6115425-v_mishra@users.noreply.gitlab.com>
Approved-by: Lee Tickett <ltickett@gitlab.com>
Approved-by: Miranda Fluharty <mfluharty@gitlab.com>
Approved-by: Kushal Pandya <kushalspandya@gmail.com>
Reviewed-by: Kushal Pandya <kushalspandya@gmail.com>
Reviewed-by: Darby Frey <dfrey@gitlab.com>
Reviewed-by: Miranda Fluharty <mfluharty@gitlab.com>
Reviewed-by: Veethika M <6115425-v_mishra@users.noreply.gitlab.com>
Reviewed-by: Lee Tickett <ltickett@gitlab.com>
Co-authored-by: Darby Frey <darbyfrey@gmail.com>

be385ed0

Merge branch '384226-fix-app-home-strings' into 'master' · 1a8a5d3c

由 Bojan Marjanovic 创作于 1月 27, 2023

Fix copy in GitLab for Slack app home tab

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110139



Merged-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Approved-by: Andy Soiron <asoiron@gitlab.com>
Approved-by: Libor Vanc <5022246-lvanc@users.noreply.gitlab.com>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Reviewed-by: Andy Soiron <asoiron@gitlab.com>
Reviewed-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Co-authored-by: Luke Duncalfe <lduncalfe@eml.cc>

1a8a5d3c

Abstract repeatedly used logic into functions · f11bb16a
由 Savas Vedova 创作于 1月 25, 2023

f11bb16a

Merge branch... · d6364b05

由 Matt Kasa 创作于 1月 27, 2023

Merge branch '285559-correct-not-null-differences-between-production-and-structure-sql-3' into 'master'

Resolve "Fix NOT NULL differences between production and structure.sql"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110219



Merged-by: Matt Kasa <mkasa@gitlab.com>
Approved-by: Omar Qunsul <oqunsul@gitlab.com>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Approved-by: Matt Kasa <mkasa@gitlab.com>
Co-authored-by: dfrazao-gitlab <dfrazao@gitlab.com>

d6364b05

Merge branch 'yash240408-master-patch-09441' into 'master' · 6a4bda27

由 Kati Paizee 创作于 1月 27, 2023

Yash240408 master patch 09441

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110212



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Reviewed-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Yash Mistry <yash.mistry.g43@gmail.com>

6a4bda27

Yash240408 master patch 09441 · 98af4505
由 Yash Mistry 创作于 1月 27, 2023

98af4505

Add explicit foreign key to security scans · be328e1e

由 Heinrich Lee Yu 创作于 1月 27, 2023

This is needed for Rails 7 because we override the model name to Job and
Rails now uses the model name to determine the default foreign key name

be328e1e