Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ end

group(:development, :test) do
gem("smart_properties", require: false)
gem("frozen_record", require: false)
gem("frozen_record", github: "byroot/frozen_record", branch: "master", require: false)
gem("sprockets", require: false)
gem("rails", require: false)
gem("state_machines", require: false)
Expand All @@ -38,7 +38,7 @@ group(:development, :test) do
gem("shopify-money", require: false)
gem("sidekiq", require: false)
gem("nokogiri", require: false)
gem("config", require: false)
gem("config", github: "rubyconfig/config", branch: "master", require: false)
gem("aasm", require: false)
gem("bcrypt", require: false)
gem("xpath", require: false)
Expand Down
36 changes: 24 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
GIT
remote: https://github.com/byroot/frozen_record.git
revision: 4130a0600874aae2b8c83108053255d67f0cad08
branch: master
specs:
frozen_record (0.23.0)
activemodel
dedup

GIT
remote: https://github.com/csfrancis/cityhash.git
revision: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
ref: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
specs:
cityhash (0.6.0)

GIT
remote: https://github.com/rubyconfig/config.git
revision: 740fe1fd235649e41d5813d5a618caa3969be13b
branch: master
specs:
config (4.0.0)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)

PATH
remote: .
specs:
Expand Down Expand Up @@ -107,16 +125,13 @@ GEM
byebug (11.1.3)
coderay (1.1.3)
concurrent-ruby (1.1.10)
config (4.0.0)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
connection_pool (2.2.5)
crass (1.0.6)
dedup (0.1.4)
deep_merge (1.2.2)
diff-lcs (1.5.0)
digest (3.1.0)
dry-configurable (0.13.0)
dry-configurable (0.15.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.6)
dry-container (0.9.0)
Expand All @@ -125,11 +140,11 @@ GEM
dry-core (0.7.1)
concurrent-ruby (~> 1.0)
dry-inflector (0.2.1)
dry-initializer (3.0.4)
dry-initializer (3.1.1)
dry-logic (1.2.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.5, >= 0.5)
dry-schema (1.8.0)
dry-schema (1.9.2)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.13, >= 0.13.0)
dry-core (~> 0.5, >= 0.5)
Expand All @@ -142,16 +157,13 @@ GEM
dry-core (~> 0.5, >= 0.5)
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
dry-validation (1.7.0)
dry-validation (1.8.1)
concurrent-ruby (~> 1.0)
dry-container (~> 0.7, >= 0.7.1)
dry-core (~> 0.5, >= 0.5)
dry-initializer (~> 3.0)
dry-schema (~> 1.8, >= 1.8.0)
erubi (1.10.0)
frozen_record (0.23.0)
activemodel
dedup
globalid (1.0.0)
activesupport (>= 5.0)
google-protobuf (3.21.1)
Expand Down Expand Up @@ -331,8 +343,8 @@ DEPENDENCIES
activeresource
bcrypt
cityhash!
config
frozen_record
config!
frozen_record!
google-protobuf
identity_cache
minitest
Expand Down
6 changes: 0 additions & 6 deletions tasks/generator_documentation.rake
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# typed: true
# frozen_string_literal: true

# Temporary fix for CI
# A patch as been upstreamed, we're waiting for it to be merged.
# See https://github.com/rubyconfig/config/pull/319
# TODO: remove this one the patch is released.
require "rails"

require "yard"
require "tapioca"
require "tapioca/runtime/reflection"
Expand Down