diff --git a/.ruby-version b/.ruby-version index 849c0c4..ff365e0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.7.5 +3.1.3 diff --git a/Gemfile b/Gemfile index f568140..dc851eb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,13 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.7.5' +ruby '3.1.3' -gem 'activeadmin', '2.2.0' +gem 'activeadmin', '~> 2.9' gem 'activerecord-import' -gem 'bootsnap', '>= 1.4.2', require: false +# gem 'bootsnap', '>= 1.4.2', require: false +gem 'logger' +gem 'psych', '< 4' gem 'bootstrap3-datetimepicker-rails', '~> 4.17.43' gem 'bootstrap4-kaminari-views' gem 'coffee-rails' @@ -20,7 +22,7 @@ gem 'kaminari' gem 'momentjs-rails', '>= 2.9.0' gem 'pg', '>= 0.18', '< 2.0' gem 'puma', '~> 5.0' -gem 'rails', '~> 6.0.2', '>= 6.0.2.2' +gem 'rails', '~> 6.1.0' gem 'ransack' gem 'rollbar' gem 'rouge' @@ -33,7 +35,7 @@ gem 'sprockets', '~> 3.7' gem 'sprockets-rails', require: 'sprockets/railtie' gem 'vandal_ui', '~> 0.4' gem 'wicked' -gem "omniauth-github" +gem "omniauth-github", "~> 1.4" gem "omniauth-rails_csrf_protection" group :development, :test do @@ -47,6 +49,6 @@ group :development do gem 'annotate' gem 'better_errors' gem 'binding_of_caller' - gem 'listen', '>= 3.0.5', '< 3.2' + gem 'listen', '~> 3.8' gem 'web-console', '>= 3.3.0' end diff --git a/Gemfile.lock b/Gemfile.lock index a2969c2..1d086c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT GIT remote: https://github.com/firstdraft/ideas_generators.git - revision: 9d6dbd9b2603a800cf76ec25fec78d53e5c95d3b + revision: c1c214d95ffe14ce49d97d9947c9fb268096f4d8 specs: ideas_generators (0.1.0) railties @@ -18,103 +18,99 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.2) - actionpack (= 6.0.3.2) + actioncable (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actionmailbox (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (>= 2.7.1) - actionmailer (6.0.3.2) - actionpack (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) + actionmailer (6.1.7.10) + actionpack (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.2) - actionview (= 6.0.3.2) - activesupport (= 6.0.3.2) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.10) + actionview (= 6.1.7.10) + activesupport (= 6.1.7.10) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.2) - actionpack (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actiontext (6.1.7.10) + actionpack (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) nokogiri (>= 1.8.5) - actionview (6.0.3.2) - activesupport (= 6.0.3.2) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activeadmin (2.2.0) + activeadmin (2.14.0) arbre (~> 1.2, >= 1.2.1) - formtastic (~> 3.1) + formtastic (>= 3.1, < 5.0) formtastic_i18n (~> 0.4) inherited_resources (~> 1.7) jquery-rails (~> 4.2) - kaminari (~> 1.0, >= 1.0.1) - railties (>= 5.0, < 6.1) - ransack (~> 2.1, >= 2.1.1) - sassc-rails (~> 2.1) - sprockets (>= 3.0, < 4.1) - sprockets-es6 (~> 0.9, >= 0.9.2) - activejob (6.0.3.2) - activesupport (= 6.0.3.2) + kaminari (~> 1.0, >= 1.2.1) + railties (>= 6.1, < 7.1) + ransack (>= 2.1.1, < 4) + activejob (6.1.7.10) + activesupport (= 6.1.7.10) globalid (>= 0.3.6) - activemodel (6.0.3.2) - activesupport (= 6.0.3.2) - activerecord (6.0.3.2) - activemodel (= 6.0.3.2) - activesupport (= 6.0.3.2) - activerecord-import (1.0.6) - activerecord (>= 3.2) - activestorage (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) - marcel (~> 0.3.1) - activesupport (6.0.3.2) + activemodel (6.1.7.10) + activesupport (= 6.1.7.10) + activerecord (6.1.7.10) + activemodel (= 6.1.7.10) + activesupport (= 6.1.7.10) + activerecord-import (2.2.0) + activerecord (>= 4.2) + activestorage (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activesupport (= 6.1.7.10) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - arbre (1.2.1) + arbre (1.7.0) activesupport (>= 3.0.0) - ast (2.4.1) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) - base64 (0.2.0) + ruby2_keywords (>= 0.0.2) + ast (2.4.3) + base64 (0.3.0) bcrypt (3.1.20) - better_errors (2.7.1) - coderay (>= 1.0.0) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) + bigdecimal (3.2.2) bindex (0.8.1) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - bootsnap (1.4.7) - msgpack (~> 1.0) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) bootstrap3-datetimepicker-rails (4.17.47) momentjs-rails (>= 2.8.1) bootstrap4-kaminari-views (1.0.1) kaminari (>= 0.13) rails (>= 3.1) - builder (3.2.4) - coderay (1.1.3) + builder (3.3.0) coffee-rails (5.0.0) coffee-script (>= 2.2.0) railties (>= 5.2.0) @@ -122,259 +118,269 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.3.5) crass (1.0.6) - debug_inspector (0.0.3) + date (3.4.1) + debug_inspector (1.2.0) devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) + diff-lcs (1.6.2) doorkeeper (5.4.0) railties (>= 5) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) - dry-configurable (0.11.6) - concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) - dry-container (0.7.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) - concurrent-ruby (~> 1.0) - dry-equalizer (0.3.0) - dry-inflector (0.2.0) - dry-logic (1.0.6) + dotenv (3.1.8) + dotenv-rails (3.1.8) + dotenv (= 3.1.8) + railties (>= 6.1) + dry-core (1.0.2) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) - dry-types (1.4.0) + logger + zeitwerk (~> 2.6) + dry-inflector (1.1.0) + dry-logic (1.5.0) concurrent-ruby (~> 1.0) - dry-container (~> 0.3) - dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) - dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - erubi (1.9.0) - execjs (2.7.0) - factory_bot (6.1.0) - activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) - railties (>= 5.0.0) - faker (2.13.0) - i18n (>= 1.6, < 2) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - ffi (1.13.1) - formtastic (3.1.5) - actionpack (>= 3.2.13) - formtastic_i18n (0.6.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - graphiti (1.2.21) - activesupport (>= 4.1) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.2) + bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + erubi (1.13.1) + execjs (2.10.0) + factory_bot (6.5.4) + activesupport (>= 6.1.0) + factory_bot_rails (6.5.0) + factory_bot (~> 6.5) + railties (>= 6.1.0) + faker (3.5.1) + i18n (>= 1.8.11, < 2) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + ffi (1.17.2-x86_64-darwin) + formtastic (4.0.0) + actionpack (>= 5.2.0) + formtastic_i18n (0.7.0) + globalid (1.2.1) + activesupport (>= 6.1) + graphiti (1.8.2) + activesupport (>= 5.2) + concurrent-ruby (>= 1.2, < 2.0) dry-types (>= 0.15.0, < 2.0) graphiti_errors (~> 1.1.0) jsonapi-renderer (~> 0.2, >= 0.2.2) jsonapi-serializable (~> 0.3.0) graphiti_errors (1.1.2) jsonapi-serializable (~> 0.1) - graphiti_spec_helpers (1.0.5) + graphiti_spec_helpers (1.2.0) graphiti (>= 1.0.alpha.1) rspec (~> 3.0) - has_scope (0.7.2) - actionpack (>= 4.1) - activesupport (>= 4.1) + has_scope (0.8.2) + actionpack (>= 5.2) + activesupport (>= 5.2) hashie (5.0.0) - i18n (1.8.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) - indefinite_article (0.2.4) + indefinite_article (0.2.5) activesupport - inherited_resources (1.11.0) - actionpack (>= 5.0, < 6.1) - has_scope (~> 0.6) - railties (>= 5.0, < 6.1) - responders (>= 2, < 4) - jbuilder (2.10.0) + inherited_resources (1.14.0) + actionpack (>= 6.0) + has_scope (>= 0.6) + railties (>= 6.0) + responders (>= 2) + jbuilder (2.13.0) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (2.12.2) jsonapi-renderer (0.2.2) jsonapi-serializable (0.3.1) jsonapi-renderer (~> 0.2.0) - jwt (2.8.2) + jwt (3.0.0) base64 - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.6.0) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + language_server-protocol (3.17.0.5) + lint_roller (1.1.0) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) + loofah (2.24.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (1.0.0) - mimemagic (0.3.10) - nokogiri (~> 1) - rake - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.1) - momentjs-rails (2.20.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) + method_source (1.1.0) + mini_mime (1.1.5) + minitest (5.25.5) + momentjs-rails (2.29.4.1) railties (>= 3.1) - msgpack (1.3.3) multi_xml (0.6.0) - nio4r (2.5.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - oauth2 (2.0.9) - faraday (>= 0.17.3, < 3.0) - jwt (>= 1.0, < 3.0) + net-http (0.6.0) + uri + net-imap (0.4.22) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.1) + net-protocol + nio4r (2.7.4) + nokogiri (1.17.2-x86_64-darwin) + racc (~> 1.4) + oauth2 (2.0.12) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - omniauth (2.1.2) + snaky_hash (~> 2.0, >= 2.0.3) + version_gem (>= 1.1.8, < 3) + omniauth (1.9.2) hashie (>= 3.4.6) - rack (>= 2.2.3) - rack-protection - omniauth-github (2.0.1) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - omniauth-oauth2 (1.8.0) + rack (>= 1.6.2, < 3) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.7.3) oauth2 (>= 1.4, < 3) - omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.2) + omniauth (>= 1.9, < 3) + omniauth-rails_csrf_protection (0.1.2) actionpack (>= 4.2) - omniauth (~> 2.0) + omniauth (>= 1.3.1) orm_adapter (0.5.0) - parallel (1.19.2) - parser (2.7.1.4) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) - pg (1.2.3) - polyamorous (2.3.2) - activerecord (>= 5.2.1) - puma (5.6.8) + racc + pg (1.5.9) + prism (1.4.0) + psych (3.3.4) + puma (5.6.9) nio4r (~> 2.0) - rack (2.2.3) - rack-protection (3.0.6) - rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.3.2) - actioncable (= 6.0.3.2) - actionmailbox (= 6.0.3.2) - actionmailer (= 6.0.3.2) - actionpack (= 6.0.3.2) - actiontext (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) - activemodel (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) - bundler (>= 1.3.0) - railties (= 6.0.3.2) + racc (1.8.1) + rack (2.2.17) + rack-test (2.2.0) + rack (>= 1.3) + rails (6.1.7.10) + actioncable (= 6.1.7.10) + actionmailbox (= 6.1.7.10) + actionmailer (= 6.1.7.10) + actionpack (= 6.1.7.10) + actiontext (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activemodel (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) + bundler (>= 1.15.0) + railties (= 6.1.7.10) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - railties (6.0.3.2) - actionpack (= 6.0.3.2) - activesupport (= 6.0.3.2) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) - rake (13.0.1) - ransack (2.3.2) - activerecord (>= 5.2.1) - activesupport (>= 5.2.1) + rake (>= 12.2) + thor (~> 1.0) + rainbow (3.1.1) + rake (13.3.0) + ransack (3.2.1) + activerecord (>= 6.1.5) + activesupport (>= 6.1.5) i18n - polyamorous (= 2.3.2) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (1.7.1) - rescue_registry (0.2.2) + regexp_parser (2.10.0) + rescue_registry (0.2.5) activesupport (>= 5.0) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rexml (3.2.4) - rollbar (2.27.0) - rouge (3.21.0) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) + rollbar (3.6.2) + rouge (4.5.2) rouge-rails (0.2.1) actionview railties rouge - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec (3.13.1) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.4) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.1) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.9.3) - rubocop (0.89.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.5) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.4) + rubocop (1.77.0) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) - parser (>= 2.7.1.1) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) - rexml - rubocop-ast (>= 0.1.0, < 1.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.45.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.3.0) - parser (>= 2.7.1.4) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.45.1) + parser (>= 3.3.7.2) + prism (~> 1.4) rubocop-rails (2.5.2) activesupport rack (>= 1.1) rubocop (>= 0.72.0) - ruby-progressbar (1.10.1) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_dep (1.5.0) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -385,54 +391,54 @@ GEM sprockets (> 3.0) sprockets-rails tilt - shoulda-matchers (4.3.0) - activesupport (>= 4.2.0) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) - sprockets (3.7.2) + shoulda-matchers (5.3.0) + activesupport (>= 5.2.0) + snaky_hash (2.0.3) + hashie (>= 0.1.0, < 6) + version_gem (>= 1.1.8, < 3) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (1.0.1) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.7) - thread_safe (~> 0.1) - unicode-display_width (1.7.0) + thor (1.3.2) + tilt (2.6.0) + timeout (0.4.3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) + uri (1.0.3) vandal_ui (0.4.5) - version_gem (1.1.4) + version_gem (1.1.8) warden (1.2.9) rack (>= 2.0.9) - web-console (4.0.4) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket-driver (0.7.3) + websocket-driver (0.8.0) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked (1.3.4) + wicked (2.0.0) railties (>= 3.0.7) - zeitwerk (2.4.0) + zeitwerk (2.6.18) PLATFORMS - ruby + x86_64-darwin-22 DEPENDENCIES - activeadmin (= 2.2.0) + activeadmin (~> 2.9) activerecord-import annotate better_errors binding_of_caller - bootsnap (>= 1.4.2) bootstrap3-datetimepicker-rails (~> 4.17.43) bootstrap4-kaminari-views coffee-rails @@ -448,13 +454,15 @@ DEPENDENCIES indefinite_article jbuilder (~> 2.7) kaminari - listen (>= 3.0.5, < 3.2) + listen (~> 3.8) + logger momentjs-rails (>= 2.9.0) - omniauth-github + omniauth-github (~> 1.4) omniauth-rails_csrf_protection pg (>= 0.18, < 2.0) + psych (< 4) puma (~> 5.0) - rails (~> 6.0.2, >= 6.0.2.2) + rails (~> 6.1.0) ransack rollbar rouge @@ -470,7 +478,7 @@ DEPENDENCIES wicked RUBY VERSION - ruby 2.7.5p203 + ruby 3.1.3p185 BUNDLED WITH - 1.17.3 + 2.2.32 diff --git a/app/models/user.rb b/app/models/user.rb index 5670ae8..88a98d7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -51,18 +51,18 @@ def to_s :omniauthable, omniauth_providers: %i[github] def self.from_omniauth(auth) - user = find_by(email: auth.info.email) + user = find_by(provider: auth.provider, uid: auth.uid) if user - user.update( - provider: auth.provider, - uid: auth.uid, - github_access_token: auth.credentials.token - ) + user.email = auth.info.email.downcase if user.email != auth.info.email.downcase + user.provider = auth.provider + user.uid = auth.uid + user.github_access_token = auth.credentials.token + user.save! else user = create do |new_user| new_user.provider = auth.provider new_user.uid = auth.uid - new_user.email = auth.info.email + new_user.email = auth.info.email.downcase new_user.password = Devise.friendly_token[0, 20] new_user.github_access_token = auth.credentials.token end diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 9bfeaed..c30a197 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -29,4 +29,5 @@ <% end %> + diff --git a/bin/render-build.sh b/bin/render-build.sh new file mode 100755 index 0000000..b5b5b18 --- /dev/null +++ b/bin/render-build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# exit on error +set -o errexit + +bundle install +./bin/rails assets:precompile +./bin/rails assets:clean diff --git a/config/boot.rb b/config/boot.rb index b9e460c..4301da0 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +1,5 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. -require 'bootsnap/setup' # Speed up boot time by caching expensive operations. +require 'logger' # Fix for Ruby 3.0 compatibility +# require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/initializers/fix_logger.rb b/config/initializers/fix_logger.rb new file mode 100644 index 0000000..99dfdcf --- /dev/null +++ b/config/initializers/fix_logger.rb @@ -0,0 +1 @@ +require 'logger' \ No newline at end of file diff --git a/render.yaml b/render.yaml new file mode 100644 index 0000000..ece6039 --- /dev/null +++ b/render.yaml @@ -0,0 +1,24 @@ +databases: + - name: association-accessors + databaseName: association_accessors + user: association_accessors + region: ohio + plan: basic-256mb + +services: + - type: web + name: association-accessors + region: ohio + plan: starter + runtime: ruby + healthCheckPath: /up + buildCommand: "./bin/render-build.sh" + preDeployCommand: "./bin/rails db:migrate" + startCommand: "bundle exec puma -C config/puma.rb" + envVars: + - key: DATABASE_URL + fromDatabase: + name: association-accessors + property: connectionString + - key: WEB_CONCURRENCY + value: 2