diff --git a/Gemfile.lock b/Gemfile.lock index 35013bf3..bd46c3a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - phcdevworks_accounts_devise (0.1.2.pre.beta) + phcdevworks_accounts_devise (0.1.3.pre.beta) aws-sdk-s3 (~> 1.113) devise (~> 4.8) friendly_id (~> 5.4) @@ -91,7 +91,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.568.0) + aws-partitions (1.573.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -108,7 +108,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.17) builder (3.2.4) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) declarative (0.0.20) devise (4.8.1) @@ -127,29 +127,10 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.2.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (2.0.1) ffi (1.15.5) friendly_id (5.4.2) activerecord (>= 4.0.0) @@ -171,8 +152,8 @@ GEM google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.2.0) google-cloud-storage (1.36.1) addressable (~> 2.8) @@ -196,13 +177,12 @@ GEM inline_svg (1.8.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-wait (0.2.1) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.1) jwt (2.3.0) - loofah (2.15.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -217,7 +197,6 @@ GEM mini_mime (1.1.2) minitest (5.15.0) multi_json (1.15.0) - multipart-post (2.1.1) net-imap (0.2.3) digest net-protocol @@ -226,8 +205,7 @@ GEM digest net-protocol timeout - net-protocol (0.1.2) - io-wait + net-protocol (0.1.3) timeout net-smtp (0.3.1) digest @@ -257,12 +235,12 @@ GEM phcthemes_admin_panel_pack (~> 5.1) phcthemes_web_theme_pack (~> 5.0) rails (~> 7.0) - phcthemes_admin_panel_pack (5.1.2) + phcthemes_admin_panel_pack (5.1.5) gravtastic (~> 3.2) inline_svg (~> 1.7) rails (~> 7.0) sassc-rails (~> 2.1) - phcthemes_web_theme_pack (5.0.0) + phcthemes_web_theme_pack (5.0.3) gravtastic (~> 3.2) inline_svg (~> 1.7) rails (~> 7.0) @@ -315,7 +293,7 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-rails (5.1.1) @@ -352,7 +330,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - stripe (5.45.0) + stripe (5.48.0) strscan (3.0.1) thor (1.2.1) tilt (2.0.10) diff --git a/app/views/layouts/phcdevworks_accounts_devise/components/backend/footer/_footer.html.erb b/app/views/layouts/phcdevworks_accounts_devise/components/backend/footer/_footer.html.erb index dff942ec..3a36da34 100644 --- a/app/views/layouts/phcdevworks_accounts_devise/components/backend/footer/_footer.html.erb +++ b/app/views/layouts/phcdevworks_accounts_devise/components/backend/footer/_footer.html.erb @@ -2,7 +2,7 @@ 2012-<%= Time.now.year %> - - PHCDevworks Accounts (Devise) - Engine v<%= Gem.loaded_specs["phcdevworks_accounts_devise"].version.to_s %> + PHCDevworks Accounts (Devise) - Engine v<%= Gem.loaded_specs["phcdevworks_accounts_devise"].version.to_s %> @@ -11,7 +11,7 @@ Developed with by - PHCDevworks + PHCDevworks diff --git a/app/views/layouts/phcdevworks_accounts_devise/components/backend/navigation/_top_menu.html.erb b/app/views/layouts/phcdevworks_accounts_devise/components/backend/navigation/_top_menu.html.erb index c6aa2f48..bd53b747 100644 --- a/app/views/layouts/phcdevworks_accounts_devise/components/backend/navigation/_top_menu.html.erb +++ b/app/views/layouts/phcdevworks_accounts_devise/components/backend/navigation/_top_menu.html.erb @@ -1,4 +1,4 @@ - + - + - + <% if current_user %>