Ensure that all floated elements in the header stay within it

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a5b7d401f480574b8e30ecf48297e96fa76c5907..10e34638eb8d294706f9d7cf8ca543418ec28380 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "6.0.3.6"
+gem "rails", "6.1.3.2"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -40,7 +40,7 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"

-gem "composite_primary_keys", "~> 12.0.0"
+gem "composite_primary_keys", "~> 13.0.0"

 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"


@@ -117,7 +117,7 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
 gem "aws-sdk-s3"
 
 # Used to resize user images

-gem "mini_magick"
+gem "image_processing"

 
 # Gems useful for development
 group :development do
 
 # Gems useful for development
 group :development do


@@ -136,12 +136,13 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"

-  gem "puma", "~> 5.0"
+  gem "puma", "~> 5.3"

   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"

+  gem "rubocop-rake"

   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false