3833 Commits

Author SHA1 Message Date
Steven Achilles
544d17841f Upgrade GitLab CE to 17.0.0 2024-05-19 21:28:47 +02:00
Steven Achilles
4a9269a118
Merge pull request #2941 from sachilles/upgrade-to-16.11.2
Upgrade GitLab CE to 16.11.2
16.11.2
2024-05-09 09:54:01 +02:00
Steven Achilles
f2e5c71294 Upgrade GitLab CE to 16.11.2 2024-05-09 00:06:44 +02:00
Steven Achilles
8ca8399805
Merge pull request #2936 from froque/update_redis_image
Update redis image to use latest patch and not a hardcoded patch
2024-05-08 23:49:06 +02:00
Steven Achilles
bdf483533e
Merge pull request #2937 from froque/fix_spelling
Fix recompile spelling
2024-05-08 23:43:50 +02:00
Filipe Roque
c9973b4ba6 Fix recompile spelling 2024-04-30 09:26:00 +01:00
Filipe Roque
ab5faa4a6c Update redis image to use latest patch and not a hardcoded patch
Current latest patch is 6.2.14
2024-04-29 10:21:21 +01:00
Steven Achilles
f7ce9dbed7
Merge pull request #2935 from sachilles/upgrade-to-16.11.1
Upgrade GitLab CE to 16.11.1
16.11.1
2024-04-27 00:49:34 +02:00
Steven Achilles
33e112e8cb Upgrade GitLab CE to 16.11.1 2024-04-26 22:29:35 +02:00
Steven Achilles
62e4d4e98a
Merge pull request #2931 from sachilles/upgrade-to-16.11.0
Upgrade GitLab CE to 16.11.0
16.11.0
2024-04-23 19:03:03 +02:00
Steven Achilles
9f0a0d268b Upgrade GitLab CE to 16.11.0 2024-04-23 16:51:58 +02:00
Steven Achilles
041b7489d5
Merge pull request #2930 from sachilles/upgrade-to-16.10.3
Upgrade GitLab CE to 16.10.3
16.10.3
2024-04-23 07:36:41 +00:00
Steven Achilles
6ec7387704 Update version information 2024-04-23 06:42:08 +02:00
Steven Achilles
18ad32c962 Upgrade GitLab CE to 16.10.3 2024-04-22 21:16:16 +02:00
Steven Achilles
d330a8380a
Merge pull request #2926 from sachilles/upgrade-to-16.10.2
Upgrade GitLab CE to 16.10.2
16.10.2
2024-04-11 19:29:50 +02:00
Steven Achilles
afdb3d5098 Upgrade GitLab CE to 16.10.2 2024-04-11 17:41:23 +02:00
Steven Achilles
31cc092b00
Merge pull request #2922 from sachilles/upgrade-to-16.10.1
[GitLab Security Release] Upgrade GitLab CE to 16.10.1
16.10.1
2024-03-28 17:15:05 +01:00
Steven Achilles
b8e299afb9 Upgrade GitLab CE to 16.10.1 2024-03-28 16:24:39 +01:00
Steven Achilles
601aa2f369
Merge pull request #2917 from kkimurak/feature-flag-via-environment-variable
Add configuration parameters to control Feature flag
2024-03-28 16:24:22 +01:00
Kazunori Kimura
351711c4cc Simplify message on feature flag target specified as reviewed
like below:

````
Configuring gitlab::feature_flags...
- Launching rails runner to set feature flags. This will take some time....
- Specified feature flags  to be disabled:
--- "auto_devops_banner_disabled"
--- "invalid_flag_name"
- Specified feature flags  to be enabled
--- "git_push_create_all_pipelines"
--- "another_invalid_flag_name"
- Following flags are probably invalid and have been ignored
--- invalid_flag_name
--- another_invalid_flag_name
- Apply user defined feature flags:
--- auto_devops_banner_disabled : off
--- git_push_create_all_pipelines : on
````

- Do not `puts` parsed options (formatted by ruby's `.to_s`),
  `puts` each specified target with three hyphens instead
- `puts` each ignored target on each line with three hyphens instead of single line csv
2024-03-24 19:17:25 +09:00
Kazunori Kimura
05794a2b47 Allow setting feature flags via configuration parameter
- It requires database is set up because
  feature flags are stored to DB (table `application_settings`)
- Add configuration parameter GITLAB_FEATURE_FLAGS_ENABLE_TARGETS
  and GITLAB_FEATURE_FLAGS_DISABLE_TARGETS
- Add ruby script to configure feature flags from command line
  and invoke runtime (from configure_gitlab())
2024-03-24 18:43:51 +09:00
Kazunori Kimura
846a051bbe Allow additional configurations after DB migration
Such as feature flags (which is stored to database, application_settings table)

At this commit, it does nothing (no operation `:`)
2024-03-24 18:43:51 +09:00
Steven Achilles
4489db2bf6
Merge pull request #2918 from sachilles/upgrade-to-16.10.0
Upgrade GitLab CE to 16.10.0
16.10.0
2024-03-21 22:37:24 +01:00
Steven Achilles
12c97f194a Upgrade GitLab CE to 16.10.0 2024-03-21 21:39:44 +01:00
Steven Achilles
f61dece272
Merge pull request #2916 from sachilles/upgrade-to-16.9.2
[GitLab Security Release] Upgrade GitLab CE to 16.9.2
16.9.2
2024-03-07 20:15:42 +01:00
Steven Achilles
689751cb91 Upgrade GitLab CE to 16.9.2 2024-03-07 18:56:27 +01:00
Steven Achilles
562d8d5c89
Merge pull request #2911 from sachilles/upgrade-to-16.9.1
[GitLab Security Release] Upgrade GitLab CE to 16.9.1
16.9.1
2024-02-22 05:08:47 +01:00
Steven Achilles
a9451704ad Upgrade GitLab CE to 16.9.1 2024-02-21 21:52:08 +01:00
Steven Achilles
95c43bb058
Merge pull request #2907 from sachilles/upgrade-to-16.9.0
Upgrade GitLab CE to 16.9.0
16.9.0
2024-02-15 19:46:25 +01:00
Steven Achilles
9b9b83db4e Update orbs of CircleCI configuration 2024-02-15 17:52:51 +01:00
Steven Achilles
d5bc564601 Upgrade GitLab CE to 16.9.0 2024-02-15 17:30:11 +01:00
Steven Achilles
5f79225308
Merge pull request #2903 from sachilles/upgrade-to-16.8.2
[GitLab Security Release] Upgrade GitLab CE to 16.8.2
16.8.2
2024-02-13 06:18:32 +01:00
Steven Achilles
82b2c17162 Upgrade GitLab CE to 16.8.2 2024-02-12 21:27:12 +01:00
Steven Achilles
6e8f176318
Merge pull request #2897 from kkimurak/ruby-patching
Add patch for Ruby to fix issue on running on legacy kernel
2024-02-12 21:23:24 +01:00
Kazunori Kimura
9f5961939d Allow patching Ruby, add patch for lib/securernadom.rb
Backport: fix behavior of `SecureRandom.gen_random_openssl(n)`
commit:
64e503eb62

This has been merged into the Ruby 3.3 release, but Ruby (at least) 3.0 and later are affected by the issues fixed by this commit.
2024-02-13 04:27:50 +09:00
Kazunori Kimura
e636b969a9 Revise build patch structure
to allow patching each middleware or library

Just move patches to assets/build/patches/gitlabhq
Folder name are matched to assets/runtime/config
2024-02-13 04:27:50 +09:00
Steven Achilles
74f8514385
Merge pull request #2901 from danyill/issue-2790-secure-ci-folder
Create ci_secure_files directory if missing, closes #2790
2024-02-12 19:55:10 +01:00
Steven Achilles
3926da3070
Merge pull request #2893 from kkimurak/ruby3.2.x
Update Ruby to 3.2.3
2024-02-12 19:51:13 +01:00
Daniel Mulholland
3f2e8c2ce4
Create ci_secure_files directory if missing, closes #2790 2024-02-11 10:17:36 +13:00
Kazunori Kimura
acabea3a49 Update Ruby to 3.2.3 2024-01-30 06:39:52 +00:00
Kazunori Kimura
1c286f72d1 Remove trailing whitespace in patch for assets:compile
to suppress warning on build like below:

    Applying patch /etc/docker-gitlab/build/patches/0004-fix-raketask-gitlab-assets-compile.patch for gitlab-foss...
    <stdin>:15: trailing whitespace.
           removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
    warning: 1 line adds whitespace errors.
2024-01-30 06:39:52 +00:00
Kazunori Kimura
9345235f27 Replace removed function in patch for assets::compile
`Dir.exists?(file_name) -> bool` have been deprecated since Ruby 2.1
and removed on Ruby 3.2.
See https://bugs.ruby-lang.org/issues/17391

Replacement is `Dir.exist?(file_name) -> bool`.
2024-01-30 06:39:52 +00:00
Steven Achilles
cfad6e95c4
Merge pull request #2891 from sachilles/upgrade-to-16.8.1
[GitLab Critical Security Release] Upgrade GitLab CE to 16.8.1
16.8.1
2024-01-25 22:57:56 +01:00
Steven Achilles
b546aeb955 Upgrade GitLab CE to 16.8.1 2024-01-25 22:05:03 +01:00
Steven Achilles
416706045b
Merge pull request #2885 from sachilles/upgrade-to-16.8.0
Upgrade to GitLab CE 16.8.0
16.8.0
2024-01-19 23:53:02 +01:00
Steven Achilles
7a536bcdfd Upgrade to GitLab CE 16.8.0 2024-01-19 22:59:19 +01:00
Steven Achilles
5b092729fa
Merge pull request #2884 from kkimurak/issue/2866-fix-assets_webpack_manifest.json-not-found
Add build patch to prevent rake task assets:compile to remove assets dir
2024-01-19 22:53:40 +01:00
Steven Achilles
de1350b884
Merge pull request #2883 from kkimurak/remove-ajv-as-an-explicit-deps
Remove ajv as an explicit dependency
2024-01-19 22:46:53 +01:00
Kazunori Kimura
3885a455d1 Add build patch to prevent rake task assets:compile to remove assets dir
GitLab does not launch after second run if relative url is used.
This is caused by following upstream change to remove assets directory on assets compile.
See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103715

This is introduced on v15.6.0
````sh
$ git -C ../gitlab.git/ tag --contains e46d92c0 | sort --version-sort | head -n 1
v15.6.0-ee
````

1. `sameersbn/gitlab` create symbolic link /home/git/gitlab/public/assets/
  to point /home/git/data/tmp/assets if relative url is used.
  This is to store assets in the docker volume to avoid unnecessary recompilations.
  These assets are removed and recompiled only when the gitlab version or relative url root is changed.
2. By the change provided by gitlab.com/gitlab-org/gitlab!103715,
  rake task `gitlab:assets:compile` became to remove assets directory directly (by `FileUtils.rm_rf()`).
  It does not remove compiled assets itself, but remove symlink /home/git/gitlab/public/assets .
  Then it compiles assets as usual, but they will be stored in newly-created normal directory /home/git/gitlab/public/assets/
3. On container down, whole container statement (except volumes) will be reset.
  These compiled assets will be removed as well because they are not in docker volume.
4. As we store version info and relative url root path to /home/git/data/tmp/,
  we cannot recognize we have to recompile assets (that have been removed by mistake)

To avoid the issue, this commit add a build time patch to change the behavior of rake task `gitlab:assets:compile`
to empty assets instead of removing assets directory itself.
2024-01-18 18:10:26 +09:00
Kazunori Kimura
d16119b54b Remove ajv as an explicit dependency
There was an issue that `ajv` is not installed by mistake.
This issue have been fixed on upstream, a few years ago.

Now, we can revert the change.
This commit partially reverts 985d57afb9673b2f5acb1f12cbc13f230f6ec074
See sameersbn/gitlab#1358

It seems that fix MR on upstream is https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14543
but we cannot check diff because source / target branch removed by mistake

Anyway, no need to add ajv as an explicit dependency with (at least) gitlab v11 or later
2024-01-18 15:42:17 +09:00