Make search input a direct child of input group

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c25240f9ff0623f547dfc17f46942484e27b7efe..ebbebe4f9ddf8c5486dcebf19ebb0b6395e4d24b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,9 @@ gem "json"
 gem "pg"
 
 # Use SCSS for stylesheets
 gem "pg"
 
 # Use SCSS for stylesheets

-gem "sassc-rails"
+gem "dartsass-sprockets"
+# Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
+gem "sass-embedded", "~> 1.64.0"

 
 # Use Terser as compressor for JavaScript assets
 gem "terser"
 
 # Use Terser as compressor for JavaScript assets
 gem "terser"


@@ -43,7 +45,7 @@ gem "sprockets-exporters_pack"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"

-gem "bootstrap", "~> 5.1.0"
+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 "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"


@@ -72,9 +74,9 @@ gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"

+gem "omniauth-microsoft_graph"

 gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"

-gem "omniauth-windowslive"

 
 # Doorkeeper for OAuth2
 gem "doorkeeper"
 
 # Doorkeeper for OAuth2
 gem "doorkeeper"


@@ -153,6 +155,7 @@ group :test do
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-capybara"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-capybara"

+  gem "rubocop-factory_bot"

   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"