Commit bff6c914 authored by Stan Hu's avatar Stan Hu

Merge branch '345094-sync-gemfile-lock-in-jh' into 'master'

Sync `jh/Gemfile.lock` with `Gemfile.lock` + Upgrade Rugged

See merge request gitlab-org/gitlab!73915
parents a97ccbe5 5def0d1c
...@@ -129,6 +129,7 @@ add-jh-folder: ...@@ -129,6 +129,7 @@ add-jh-folder:
- curl --location -o "jh-folder.tar.gz" "https://gitlab.com/gitlab-jh/gitlab/-/archive/main-jh/gitlab-main-jh.tar.gz?path=jh" - curl --location -o "jh-folder.tar.gz" "https://gitlab.com/gitlab-jh/gitlab/-/archive/main-jh/gitlab-main-jh.tar.gz?path=jh"
- tar -xf "jh-folder.tar.gz" - tar -xf "jh-folder.tar.gz"
- mv gitlab-main-jh-jh/jh/ ./ - mv gitlab-main-jh-jh/jh/ ./
- cp Gemfile.lock jh/
- ls -l jh/ - ls -l jh/
artifacts: artifacts:
expire_in: 2d expire_in: 2d
......
...@@ -17,7 +17,7 @@ gem 'default_value_for', '~> 3.4.0' ...@@ -17,7 +17,7 @@ gem 'default_value_for', '~> 3.4.0'
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.1' gem 'rugged', '~> 1.2'
gem 'grape-path-helpers', '~> 1.7.0' gem 'grape-path-helpers', '~> 1.7.0'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
......
...@@ -1130,7 +1130,7 @@ GEM ...@@ -1130,7 +1130,7 @@ GEM
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
rubyzip (2.0.0) rubyzip (2.0.0)
rugged (1.1.0) rugged (1.2.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
safety_net_attestation (0.4.0) safety_net_attestation (0.4.0)
jwt (~> 2.0) jwt (~> 2.0)
...@@ -1607,7 +1607,7 @@ DEPENDENCIES ...@@ -1607,7 +1607,7 @@ DEPENDENCIES
ruby-saml (~> 1.13.0) ruby-saml (~> 1.13.0)
ruby_parser (~> 3.15) ruby_parser (~> 3.15)
rubyzip (~> 2.0.0) rubyzip (~> 2.0.0)
rugged (~> 1.1) rugged (~> 1.2)
sanitize (~> 5.2.1) sanitize (~> 5.2.1)
sassc-rails (~> 2.1.0) sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0) sd_notify (~> 0.1.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment