JSON output added to permissions endpoint

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 15348a9898a49b4572ab231f7625c479a93e0ba9..8782fdfeffd47aef046f2f1db90366ffb6c8012d 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.1.4.1"
+gem "rails", "7.0.2.2"

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


@@ -43,7 +43,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", "~> 13.0.0"
+gem "composite_primary_keys", "~> 14.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"


@@ -51,7 +51,7 @@ gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"

-gem "rails-i18n", "~> 6.0.0"
+gem "rails-i18n", "~> 7.0.0"

 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"


@@ -149,9 +149,9 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"

-  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rails"

   gem "rubocop-rake"
   gem "rubocop-rake"

-  gem "selenium-webdriver", "~> 3.142.7"
+  gem "selenium-webdriver"

   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"