Skip to content

Commit

Permalink
Merge branch 'aaf-develop' into code-develop
Browse files Browse the repository at this point in the history
* aaf-develop:
  Bump nokogiri from 1.13.4 to 1.13.6 (ausaccessfed#259)
  Bump rack from 2.2.3 to 2.2.3.1 (ausaccessfed#260)
  fix: mysqld_safe: command not found (ausaccessfed#258)
  Bump nokogiri from 1.13.3 to 1.13.4 (ausaccessfed#256)
  Bump puma from 5.6.2 to 5.6.4 (ausaccessfed#255)
  Gemfile updates (ausaccessfed#254)
  Add platform `x86_64-linux` (ausaccessfed#252)
  Upgrade to rails `6.0.4.4` (ausaccessfed#249)
  Bump nokogiri from 1.12.5 to 1.13.3
  Bump puma from 5.5.2 to 5.6.2
  Update puma to 5.5.2
  • Loading branch information
James-REANNZ committed Aug 15, 2022
2 parents 8c9a166 + de861b6 commit 19f1031
Show file tree
Hide file tree
Showing 21 changed files with 327 additions and 170 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

source 'https://rubygems.org'

gem 'rails', '>= 5', '< 6'
gem 'rails', '<6.1'
gem 'sass-rails'

gem 'jbuilder'
gem 'mysql2'
gem 'slim'
gem 'therubyracer', require: false
gem 'uglifier', require: false

gem 'redis'
Expand Down
Loading

0 comments on commit 19f1031

Please sign in to comment.