Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync upstream configuration #2570

Draft
wants to merge 47 commits into
base: master
Choose a base branch
from
Draft

Sync upstream configuration #2570

wants to merge 47 commits into from

Commits on Oct 24, 2022

  1. Sync config v7.9.0 : Sync comment in smtp_settings.rb 

    Just to reduce noisy diff
Original commit:
https://gitlab.com/gitlab-org/gitlab/-/commit/890f14786a49cb715d8856c1a6917003649796c5

First contain gitalb v7.9.0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    32036f7 View commit details
    Browse the repository at this point in the history

  2. Sync config v13.0.0 : Change usage of Redis slave to replica in resqu… 

    …e.yml

This commit is imported from upstream.
For moredetail, see corresponding merge request.
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32275
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    946ed85 View commit details
    Browse the repository at this point in the history

  3. Sync config v11.0.0 : Add db: load_balancing 

    Currently commented-out and no effect.
See corresponding MR and commit:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5883
https://gitlab.com/gitlab-org/gitlab/-/commit/0cab88ef72fe2c41cb2f1df2f619741e335887a0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    67bef4f View commit details
    Browse the repository at this point in the history

  4. Sync config v13.2.0 : gitaly: Fix double quote for tls_listen_addr 

    Just fixing commented-out config, no effect
See upstream commit:
https://gitlab.com/gitlab-org/gitaly/-/commit/4290807efcf2de64d5c1e8abce15399361da42f9

Note : I have checked which version contains the commit
using `git tag --contains <commit ID> | sort --version-sort`
v13.1.0-rc4 and v13.2.0 or above contains the commit,
but v13.1.0 does not. I have no idea why

First contains (stable) gitlay v13.2.0
Corresponding gitlab v13.2.0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    e31cb7f View commit details
    Browse the repository at this point in the history

  5. SYnc config v13.2.0 : Add consolidated object_storage config in one p… 

    …lace (commented-out)

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34460
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    a0d906c View commit details
    Browse the repository at this point in the history

  6. Sync config v13.3.0 : remove DB_POOL 

    This is imported from upstream.
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38049

First tag contains this change: v13.3.0-ee
$ git tag --contain ce37ceb7 | sort --version-sort | head -n 1
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    74cfc7a View commit details
    Browse the repository at this point in the history

  7. Sync config v13.3.0 : Add commented-out configs for AWS S3 server sid… 

    …e encryption

See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38240
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    290cff5 View commit details
    Browse the repository at this point in the history

  8. Sync config v13.3.0 : gitlab-shell: Add commented out config ssl_cert… 

    …_dir

See upstream merge request:
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/393

First contain gitlab-shell v13.4.0
Corresponding gitlab v13.3.0
(Corresponding MR : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37677)
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    a2e37f9 View commit details
    Browse the repository at this point in the history

  9. Sync config v13.4.2 : gitlab-shell: Add commented-out config gitlab_r… 

    …elative_url_root

Only affected if UNIX sockets are used for gitlab_url.
sameersbn/gitlab uses http:// and is not affected.
See upstream merge request:
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/406

First contain gitlab-shell v13.7.0
Corresponding gitlab v13.4.2
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    9eb17cc View commit details
    Browse the repository at this point in the history

  10. Sync config v13.5.0 : Update link to redis docs in config/resque.yml 

    This commit is imported from upstream.
For more detail, see corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44533
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    8c02e96 View commit details
    Browse the repository at this point in the history

  11. Sync config v13.5.0 : gitlab-shell: Add commented-out config secret 

    See corresponding commit:
https://gitlab.com/gitlab-org/gitlab-shell/-/commit/6cef08511b8c830fcb67879118e4be8747f07cc6

This configuration have been introduced without MR,
but handling is introduced in the MR:
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/284

First contain gitlab-shell v13.8.0
Corresponding gitlab v13.5.0
(MR : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44852)
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    1d78bba View commit details
    Browse the repository at this point in the history

  12. Sync config v13.7.0 : Rename PIWIK_* to MATOMO_* 

    Legacy configuration parameter still works as fallback.
See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45658
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    495291b View commit details
    Browse the repository at this point in the history

  13. Sync config v13.8.0 : Update puma.rb: upstream/48897 

    See corresponding merge request:
Update puma & puma_worker_killer to upstream (5.1.1)
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48897
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    a548218 View commit details
    Browse the repository at this point in the history

  14. Sync config v13.8.0 : Update puma.rb: upstream/51467 

    See corresponding merge request:
Use Puma `nakayoshi_fork`
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51467
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    1f922e3 View commit details
    Browse the repository at this point in the history

  15. Sync config v13.9.0 : Update comment: URL for feature flag docs in gi… 

    …tlab.yml

See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53004
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    9afe65b View commit details
    Browse the repository at this point in the history

  16. Sync config v13.9.0 : gitlab: Add commented-out config `application_s… 

    …ettings_cache_seconds`

See upstream merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51889
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    cdf9cd0 View commit details
    Browse the repository at this point in the history

  17. Sync config v13.10.0 : Add default config for matomo_disable_cookies … 

    …(false)

Not parameterized yet.
See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53811
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    4735b15 View commit details
    Browse the repository at this point in the history

  18. Sync config v13.10.0 : gitlab: Add allowed_hosts setting (not param… 

    …eterized)

See corresponding Merge Request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55491
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    3c6fd1d View commit details
    Browse the repository at this point in the history

  19. Sync config v13.11.0 : Fix code comments with bad capitalization 

    This commit is imported from upstream.
For more detail, see corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58911
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    c6e6b9b View commit details
    Browse the repository at this point in the history

  20. Sync config v13.11.0 : gitaly: Add commented out settings [git.config] 

    See upstream merge request:
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3279
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    8f3956b View commit details
    Browse the repository at this point in the history

  21. Sync config v13.11.0 : gitlab: Add commented-out config for SMTP conn… 

    …ection pool

See upstream config:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57805
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    92a534f View commit details
    Browse the repository at this point in the history

  22. Sync config v13.12.0 : Update comment: use 32 byte long version of db… 

    …_key_base

This commit is imported from upstream.
For more detail, see corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    66dfc37 View commit details
    Browse the repository at this point in the history

  23. Sync config v13.12.0 : Update puma.rb: upstream/61572 

    See corresponding upstream merge request:
Cleanup Puma 5 upgrade transition code
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61572
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    8d59979 View commit details
    Browse the repository at this point in the history

  24. Sync config v14.0.0 : gitlab.yml: Unify unicon/puma to puma 

    Also removes GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL

unicorn have been removed in v14.0
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62090
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    262658e View commit details
    Browse the repository at this point in the history

  25. Sync config v14.0.0 : Add commented-out config `display_initial_root_… 

    …password`

and set to false.
Squash of following MR and commits:
- Add option to disable printing of root password during DB seeding
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63271
- Do not display the root password by default
  https://gitlab.com/gitlab-org/gitlab/-/commit/b4b8d80d00780fbb80ecac7506dcdcfb328d4f03
  Note that the first release contains this commit is v14.5.0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    2cf6170 View commit details
    Browse the repository at this point in the history

  26. Sync config v14.2.0 : Update puma.rb: upstream/66712 

    This is imported from upstream.
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66712
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    a03c267 View commit details
    Browse the repository at this point in the history

  27. Sync config v14.3.0 : Update comment: default gitlab-shell log format… 

    … is "json"

This commit is imported from upstream.
For more detail, check corresponding merge request:
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/476

First contain : gitlab-shell v13.21.0
Corresponding gitlab v14.3.0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    b10e6d6 View commit details
    Browse the repository at this point in the history

  28. Sync config v14.7.0 : gitlab.yml: Add note about updating GDK settings 

    This is imported from upstream
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78346
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    c5527a3 View commit details
    Browse the repository at this point in the history

  29. Sync config v14.8.0 : Remove deprecated config SSL_SELF_CERT 

    This is imported from upstream.
See corresponding merge requests:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78078
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4690
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/602
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    77558c1 View commit details
    Browse the repository at this point in the history

  30. Sync config v14.9.0 : Move custom_hooks_dir from gitlab-shell to gitaly 

    This is done in gitlab 14.9 release.
See corresponding merge requests:
gitlab-shell side
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/378

gitaly side: First introduced in MR 2066 for [gitlab-shell] scope
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2066
Then moved to [hook] scope in MR 2187,
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2187
but reverted and moved back to [gitlab-shell] scope.
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2196

If the value is empty or not set, it fallback to
{gitlab-shell install directory}
See https://gitlab.com/gitlab-org/gitaly/-/blob/16b38f034eb38253006a2e69a4b4220717b45a99/internal/gitaly/config/config.go#L231-233

Also note that there was a issue for 13-0 stable about default value
(already fixed in later release)
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2275

First contained tag: v13.0.0 (gitlab-shell, gitaly, gitlab)
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    3e5fa9f View commit details
    Browse the repository at this point in the history

  31. Sync config v14.2.0 : gitlab: Add commented-out config cdn_host 

    See upstream Merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67710
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    872a6b7 View commit details
    Browse the repository at this point in the history

  32. Sync config v14.2.0 : gitlab: Add commented-out config for encrypted … 

    …SMTP credentials

See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67802
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    c95365c View commit details
    Browse the repository at this point in the history

  33. Sync config v14.9.0 : Update docs link in mail_room yml section 

    See upstream merge request
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81130
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    91c2e0c View commit details
    Browse the repository at this point in the history

  34. Sync config v14.10.0 : Add commented-out potions for gitaly: runtime_dir 

    See upstream merge request:
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4415

First contain gitaly v14.10.0
Corresponding gitlab v14.10.0
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    9b31de5 View commit details
    Browse the repository at this point in the history

  35. Sync config v15.0.0 : remove Pseudonymizer code 

    See upstream MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86087
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    06ce2a0 View commit details
    Browse the repository at this point in the history

  36. Sync config v15.0.0 : Remove direct_upload and background_upload 

    Also remove corresponding configuration parameters:
- GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD

This is introduced with v15.0 release
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86905
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    47115b2 View commit details
    Browse the repository at this point in the history

  37. Sync config v15.0.0 : Update comment: Clarify expunged vs deleted in … 

    …incoming email docs

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86747/
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    eca60f4 View commit details
    Browse the repository at this point in the history

  38. Sync config v15.1.0 : gitaly: Add commented out setting ignore_gitconfig 

    See upstream merge request:
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4588
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    9d1fa62 View commit details
    Browse the repository at this point in the history

  39. Sync config v15.2.0 : Remove GITLAB_NOTIFY_{ON_BROKEN_BUILDS, PUSHER} 

    Introduced in v15.2.0
See upstream merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91024
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    c502882 View commit details
    Browse the repository at this point in the history

  40. Sync config v15.4.0 : Add commented-out configs for microsoft_graph_m… 

    …ailer

See upstream merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97372
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    c1d7f8f View commit details
    Browse the repository at this point in the history

  41. Sync config v13.6.0 : Add gitlab.yml:packages:dpkg_deb_path 

    See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44029
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    0c3b227 View commit details
    Browse the repository at this point in the history

  42. Sync config v14.8.0 : Add ci_secure_files related configs 

    Not parameterized yet
See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78227
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    d2909aa View commit details
    Browse the repository at this point in the history

  43. Sync config v13.5.0 : Add pages deployments uploader 

    Adding pages:object_store related configurations
Still not parameterized yet
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42461
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    b05cbd9 View commit details
    Browse the repository at this point in the history

  44. Sync config v13.11.0 : Add local_store 

    See corresponding MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55470
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    d9dade8 View commit details
    Browse the repository at this point in the history

  45. Sync config v13.9.0 : Update links to redirected docs 

    Just updating link in comment
See corresponding Merge request
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53004
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    eb1fd0e View commit details
    Browse the repository at this point in the history

  46. Sync config v15.0.0 : Allow pruning of stale group runners 

    See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86477
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    595f6c9 View commit details
    Browse the repository at this point in the history

  47. Sync config v15.0.0 : Remove Legacy Job Artifact replication 

    See corresponding MR
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85219
    @kkimurak
    kkimurak committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    4209299 View commit details
    Browse the repository at this point in the history