3804 Commits

Author SHA1 Message Date
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
Steven Achilles
8daea8cd17
Merge pull request #2882 from sachilles/upgrade-to-16.7.3
Upgrade to GitLab CE 16.7.3
16.7.3
2024-01-13 17:07:13 +01:00
Steven Achilles
2e8f9ced9f Upgrade to GitLab CE 16.7.3 2024-01-13 15:36:59 +01:00
Steven Achilles
8103089ce9
Merge pull request #2879 from sachilles/Update-golang
Upgrade golang to v1.21.6
16.7.2
2024-01-12 22:59:20 +01:00
Steven Achilles
80866611b5 Upgrade golang to v1.21.6 2024-01-12 22:03:51 +01:00
Steven Achilles
80be924b8d
Merge pull request #2876 from nickshek/master
[GitLab Critical Security Release] Update GitLab version to 16.7.2
2024-01-12 22:02:35 +01:00
Nick Shek
ee8cd340ca Update GitLab version to 16.7.2 2024-01-12 17:59:34 +08:00
nickshek
9b81374361 Update GitLab version to 16.7.2 2024-01-12 17:35:14 +08:00
Steven Achilles
03e58ed5e5
Merge pull request #2871 from sachilles/upgrade-to-16.7.0
Upgrade to GitLab CE 16.7.0
16.7.0
2023-12-25 09:25:05 +01:00
Steven Achilles
00911c934d Upgrade to GitLab CE 16.7.0 2023-12-24 13:11:35 +01:00
Steven Achilles
d8013c3073
Merge pull request #2870 from sachilles/upgrade-to-16.6.2
[GitLab Security Release] Upgrade to GitLab CE 16.6.2
16.6.2
2023-12-17 00:24:16 +01:00
Steven Achilles
d6a78cca23 Upgrade to GitLab CE 16.6.2 2023-12-16 23:29:00 +01:00
Steven Achilles
c8f1f4c860
Merge pull request #2864 from alexislefebvre/patch-1
README.md: Docker is not new anymore
2023-12-16 23:13:07 +01:00
Alexis Lefebvre
ee2d082621
README.md: Docker is not new anymore 2023-12-04 11:43:53 +01:00
Steven Achilles
01d8073002
Merge pull request #2863 from sachilles/upgrade-to-16.6.1
[GitLab Security Release] Upgrade to GitLab CE 16.6.1
16.6.1
2023-12-02 09:46:05 +01:00
Steven Achilles
d74fb49fc9 Upgrade to GitLab CE 16.6.1 2023-12-02 08:49:39 +01:00
Steven Achilles
53cfbea509
Merge pull request #2857 from sachilles/upgrade-to-16.6.0
Upgrade to GitLab CE 16.6.0
16.6.0
2023-11-19 15:00:43 +01:00
Steven Achilles
d37154d59f Upgrade to GitLab CE 16.6.0 2023-11-19 13:58:48 +01:00
Steven Achilles
2f5b09717a
Merge pull request #2854 from froque/upgrade_postgres_instructions
Upgrade instructions from Postgresql 12 to 14
2023-11-19 13:42:14 +01:00
Steven Achilles
af17c908cf
Merge pull request #2847 from kkimurak/add-patch-for-preinstall.mjs-relative_url
Add build patch to avoid removing node_modules
2023-11-19 13:29:05 +01:00
Filipe Roque
51cc21dfc8 Bump orb to circleci/docker@2.4.0 2023-11-09 13:53:04 +00:00
Filipe Roque
c814fb7ac9 Upgrade instructions form Postgresql 12 to 14
Postgres 15 has a permissions problem.
See https://github.com/sameersbn/docker-postgresql/issues/168
2023-11-09 11:54:36 +00:00
Steven Achilles
53d1ab4521
Merge pull request #2853 from sachilles/upgrade-to-16.5.1
[GitLab Security Release] Upgrade to GitLab CE 16.5.1
16.5.1
2023-11-03 23:15:22 +01:00
Steven Achilles
bac9b4f876 Upgrade to GitLab CE 16.5.1 2023-11-03 22:16:56 +01:00
Steven Achilles
d7fc3877dc
Merge pull request #2849 from massej/massej/oauth_allow_bypass_two_factor
Added missing configuration variable OAUTH_ALLOW_BYPASS_TWO_FACTOR.
2023-11-03 22:03:58 +01:00
massej
e574613c9e
Update assets/runtime/config/gitlabhq/gitlab.yml
Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
2023-10-24 08:23:11 -04:00
massej
9500ad163b
Update README.md
Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
2023-10-24 08:23:00 -04:00
massej
0001125859
Update env-defaults 2023-10-24 08:22:08 -04:00
massej
6021919e32
Update docker-compose.yml 2023-10-24 08:21:28 -04:00
massej
d11ae7b617
Added missing configuration variable OAUTH_ALLOW_BYPASS_TWO_FACTOR. 2023-10-23 22:17:20 -04:00