Skip to content

Commit

Permalink
Merge branch 'master' into noauthLicense
Browse files Browse the repository at this point in the history
  • Loading branch information
felixsch authored Jan 24, 2024
2 parents c7cb42c + 73a8144 commit bf344c3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ gem 'puma', '~> 5.6.2'
gem 'mysql2', '~> 0.5.3'

gem 'nokogiri', '< 1.13' # Locked because of Ruby >= 2.6 dependency
gem 'thor'
gem 'thor', '<= 1.2.2' # Locked because of Ruby >= 2.6 dependency
gem 'activesupport', '~> 6.1.7'
gem 'actionpack', '~> 6.1.7'
gem 'actionview', '~> 6.1.7'
gem 'activemodel', '~> 6.1.7'
gem 'activerecord', '~> 6.1.7'
gem 'railties', '~> 6.1.7'
gem 'repomd_parser', '~> 0.1.4'
gem 'repomd_parser', '~> 0.1.6'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
Expand Down Expand Up @@ -60,7 +60,7 @@ group :test do
gem 'rspec-command', '1.0.3'
gem 'rspec-rails', '~> 5.0'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'ffaker'
gem 'ffaker', '<= 2.21.0' # Locked because of Ruby >= 3.0 dependency
gem 'rspec-its'
gem 'fakefs', '~> 1.4', require: 'fakefs/safe'
gem 'shoulda-matchers'
Expand All @@ -76,7 +76,7 @@ end
gem 'simplecov', require: false, group: :test

gem 'versionist'
gem 'responders'
gem 'responders', '~> 3.1.1'
gem 'typhoeus'
gem 'active_model_serializers'

Expand Down
24 changes: 13 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_model_serializers (0.10.13)
actionpack (>= 4.1, < 7.1)
activemodel (>= 4.1, < 7.1)
active_model_serializers (0.10.14)
actionpack (>= 4.1)
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activemodel (6.1.7.6)
Expand Down Expand Up @@ -140,7 +140,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
locale (2.1.3)
loofah (2.21.3)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lumberjack (1.2.8)
Expand Down Expand Up @@ -194,9 +194,10 @@ GEM
ffi (~> 1.0)
rdiscount (2.2.0.2)
regexp_parser (2.6.0)
repomd_parser (0.1.5)
repomd_parser (0.1.6)
nokogiri (~> 1.8)
responders (3.1.0)
zstd-ruby (~> 1.3, >= 1.3.5.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.6)
Expand Down Expand Up @@ -309,7 +310,8 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
yard (0.9.25)
zeitwerk (2.6.11)
zeitwerk (2.6.12)
zstd-ruby (1.5.5.0)

PLATFORMS
ruby
Expand All @@ -328,7 +330,7 @@ DEPENDENCIES
factory_bot_rails (~> 6.2.0)
fakefs (~> 1.4)
fast_gettext (~> 2.2)
ffaker
ffaker (<= 2.21.0)
fuubar
gettext
gettext_i18n_rails
Expand All @@ -343,8 +345,8 @@ DEPENDENCIES
public_suffix (< 5)
puma (~> 5.6.2)
railties (~> 6.1.7)
repomd_parser (~> 0.1.4)
responders
repomd_parser (~> 0.1.6)
responders (~> 3.1.1)
ronn
rspec-command (= 1.0.3)
rspec-its
Expand All @@ -360,7 +362,7 @@ DEPENDENCIES
spring-watcher-listen (~> 2.0.0)
strong_migrations
terminal-table (~> 3.0)
thor
thor (<= 1.2.2)
timecop
typhoeus
vcr (~> 6.0)
Expand Down
1 change: 1 addition & 0 deletions package/obs/rmt-server.changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Wed Oct 04 13:23:00 UTC 2023 - Felix Schnizlein <[email protected]>
* Dropping Rails Secrets facilities and related config files (bsc#1215176)
* rmt-client-setup-res script: fix for CentOS8 clients (bsc#1214709)
* Updated supportconfig script (bsc#1216389)
* Support zstd compression for repository metadata (bsc#1218775)

-------------------------------------------------------------------
Thu Jun 06 15:44:00 UTC 2023 - Luís Caparroz <[email protected]>
Expand Down

0 comments on commit bf344c3

Please sign in to comment.