Remove some print-related custom css

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 724dd3beccac75ba929b6ac55fa144ad97696215..229f68740e68aad4e771f482beec9ac385dc23ad 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "~> 7.0.0"
+gem "rails", "~> 7.1.0"

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


@@ -48,7 +48,6 @@ gem "active_record_union"
 gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"

-gem "composite_primary_keys", "~> 14.0.0"

 gem "config"
 gem "delayed_job_active_record"
 gem "frozen_record"
 gem "config"
 gem "delayed_job_active_record"
 gem "frozen_record"


@@ -114,7 +113,7 @@ gem "kgio"
 gem "secure_headers"
 
 # Load canonical-rails to generate canonical URLs
 gem "secure_headers"
 
 # Load canonical-rails to generate canonical URLs

-gem "canonical-rails"
+gem "canonical-rails", :github => "tomhughes/canonical-rails", :branch => "rails71"

 
 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Used to generate logstash friendly log files
 gem "logstasher"


@@ -136,7 +135,6 @@ gem "image_processing"
 
 # Gems useful for development
 group :development do
 
 # Gems useful for development
 group :development do

-  gem "annotate"

   gem "better_errors"
   gem "binding_of_caller"
   gem "debug_inspector"
   gem "better_errors"
   gem "binding_of_caller"
   gem "debug_inspector"


@@ -167,3 +165,7 @@ group :test do
   gem "simplecov-lcov", :require => false
   gem "webmock"
 end
   gem "simplecov-lcov", :require => false
   gem "webmock"
 end

+
+group :development, :test do
+  gem "annotate"
+end