Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/master/sidekiq-7.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
murny authored Nov 3, 2023
2 parents aab459a + 266648c commit 3d67320
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gem 'flipper-ui', '~> 1.0.0' # UI for feature flags
gem 'jbuilder' # generate JSON objects
gem 'kaminari' # Pagination
gem 'paper_trail', '~> 15.1.0' # Track object changes
gem 'ransack', '4.1.0' # ActiveRecord search/filter
gem 'ransack', '4.1.1' # ActiveRecord search/filter
gem 'redcarpet', '~> 3.6', require: ['redcarpet', 'redcarpet/render_strip'] # Markdown to (X)HTML parser
gem 'uuidtools'
gem 'voight_kampff', '~> 2.0', require: 'voight_kampff/rails' # bot detection
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ GEM
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
ransack (4.1.0)
ransack (4.1.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
Expand Down Expand Up @@ -669,7 +669,7 @@ DEPENDENCIES
puma (~> 6.4)
pundit (= 2.3.1)
rails (~> 6.1.7)
ransack (= 4.1.0)
ransack (= 4.1.1)
rdf (~> 3.3.1)
rdf-isomorphic (~> 3.3.0)
rdf-n3 (~> 3.3.0)
Expand Down

0 comments on commit 3d67320

Please sign in to comment.