diff --git a/Gemfile b/Gemfile index a54eb300..e5c4a91f 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'rails-i18n', '~> 6.0.0' gem 'rdiscount', '~> 2.2.0.1' gem 'rubyzip', '~> 2.3.0' gem 'activeadmin', '~> 2.9.0' -gem 'bootsnap', '~> 1.7.3', require: false +gem 'bootsnap', '~> 1.12.0', require: false gem 'has_scope', '~> 0.7.2' gem 'pundit', '~> 2.1.0' gem 'pg', '~> 1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 35305866..15244705 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.3.1) - actionpack (= 6.1.3.1) - activesupport (= 6.1.3.1) + actioncable (6.1.6) + actionpack (= 6.1.6) + activesupport (= 6.1.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.3.1) - actionpack (= 6.1.3.1) - activejob (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionmailbox (6.1.6) + actionpack (= 6.1.6) + activejob (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) mail (>= 2.7.1) - actionmailer (6.1.3.1) - actionpack (= 6.1.3.1) - actionview (= 6.1.3.1) - activejob (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionmailer (6.1.6) + actionpack (= 6.1.6) + actionview (= 6.1.6) + activejob (= 6.1.6) + activesupport (= 6.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.3.1) - actionview (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionpack (6.1.6) + actionview (= 6.1.6) + activesupport (= 6.1.6) 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.1.3.1) - actionpack (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + actiontext (6.1.6) + actionpack (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) nokogiri (>= 1.8.5) - actionview (6.1.3.1) - activesupport (= 6.1.3.1) + actionview (6.1.6) + activesupport (= 6.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -48,22 +48,22 @@ GEM kaminari (~> 1.0, >= 1.2.1) railties (>= 5.2, < 6.2) ransack (~> 2.1, >= 2.1.1) - activejob (6.1.3.1) - activesupport (= 6.1.3.1) + activejob (6.1.6) + activesupport (= 6.1.6) globalid (>= 0.3.6) - activemodel (6.1.3.1) - activesupport (= 6.1.3.1) - activerecord (6.1.3.1) - activemodel (= 6.1.3.1) - activesupport (= 6.1.3.1) - activestorage (6.1.3.1) - actionpack (= 6.1.3.1) - activejob (= 6.1.3.1) - activerecord (= 6.1.3.1) - activesupport (= 6.1.3.1) - marcel (~> 1.0.0) - mini_mime (~> 1.0.2) - activesupport (6.1.3.1) + activemodel (6.1.6) + activesupport (= 6.1.6) + activerecord (6.1.6) + activemodel (= 6.1.6) + activesupport (= 6.1.6) + activestorage (6.1.6) + actionpack (= 6.1.6) + activejob (= 6.1.6) + activerecord (= 6.1.6) + activesupport (= 6.1.6) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -97,8 +97,8 @@ GEM aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bindex (0.8.1) - bootsnap (1.7.4) - msgpack (~> 1.0) + bootsnap (1.12.0) + msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -126,7 +126,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.10) connection_pool (2.2.5) crass (1.0.6) database_cleaner (1.8.5) @@ -159,8 +159,8 @@ GEM et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) gli (2.20.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.0.0) + activesupport (>= 5.0) has_scope (0.7.2) actionpack (>= 4.1) activesupport (>= 4.1) @@ -168,7 +168,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http_accept_language (2.1.1) - i18n (1.8.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -211,26 +211,26 @@ GEM i18n (>= 0.7, < 2) json (>= 1.7.7) rest-client (>= 1.8.0) - loofah (2.9.1) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) mini_magick (4.11.0) - mini_mime (1.0.3) + mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.14.4) - msgpack (1.4.2) + minitest (5.16.1) + msgpack (1.5.2) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) netrc (0.11.0) - nio4r (2.5.7) + nio4r (2.5.8) nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -254,22 +254,22 @@ GEM raabro (1.4.0) racc (1.6.0) rack (2.2.3.1) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.3.1) - actioncable (= 6.1.3.1) - actionmailbox (= 6.1.3.1) - actionmailer (= 6.1.3.1) - actionpack (= 6.1.3.1) - actiontext (= 6.1.3.1) - actionview (= 6.1.3.1) - activejob (= 6.1.3.1) - activemodel (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + rack-test (2.0.2) + rack (>= 1.3) + rails (6.1.6) + actioncable (= 6.1.6) + actionmailbox (= 6.1.6) + actionmailer (= 6.1.6) + actionpack (= 6.1.6) + actiontext (= 6.1.6) + actionview (= 6.1.6) + activejob (= 6.1.6) + activemodel (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) bundler (>= 1.15.0) - railties (= 6.1.3.1) + railties (= 6.1.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -278,20 +278,20 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.3.1) - actionpack (= 6.1.3.1) - activesupport (= 6.1.3.1) + railties (6.1.6) + actionpack (= 6.1.6) + activesupport (= 6.1.6) method_source - rake (>= 0.8.7) + rake (>= 12.2) thor (~> 1.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.3) + rake (13.0.6) ransack (2.4.2) activerecord (>= 5.2.4) activesupport (>= 5.2.4) @@ -381,17 +381,17 @@ GEM simplecov_json_formatter (0.1.3) skylight (5.0.1) activesupport (>= 5.2.0) - sprockets (4.0.2) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sshkit (1.21.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) ttfunk (1.7.0) tzinfo (2.0.4) @@ -416,12 +416,12 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.2) + zeitwerk (2.6.0) PLATFORMS ruby @@ -429,7 +429,7 @@ PLATFORMS DEPENDENCIES activeadmin (~> 2.9.0) aws-sdk-s3 (~> 1.94) - bootsnap (~> 1.7.3) + bootsnap (~> 1.12.0) bootstrap-sass (~> 3.4) byebug (~> 11.0) capistrano (~> 3.1) diff --git a/app/assets/stylesheets/application/bootstrap-custom.scss b/app/assets/stylesheets/application/bootstrap-custom.scss index 4d9e6df4..8b57fc34 100644 --- a/app/assets/stylesheets/application/bootstrap-custom.scss +++ b/app/assets/stylesheets/application/bootstrap-custom.scss @@ -1,12 +1,3 @@ -/*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * - * This file lists all the available Bootstrap modules, uncomment - * the modules you want to import - */ - // Core variables and mixins @import "bootstrap-overrides"; @import "bootstrap/variables"; @@ -33,27 +24,18 @@ @import "bootstrap/input-groups"; @import "bootstrap/navs"; @import "bootstrap/navbar"; -// @import "bootstrap/breadcrumbs"; @import "bootstrap/pagination"; @import "bootstrap/pager"; @import "bootstrap/labels"; @import "bootstrap/badges"; -// @import "bootstrap/jumbotron"; -// @import "bootstrap/thumbnails"; @import "bootstrap/alerts"; -// @import "bootstrap/progress-bars"; @import "bootstrap/media"; @import "bootstrap/list-group"; @import "bootstrap/panels"; @import "bootstrap/responsive-embed"; -// @import "bootstrap/wells"; @import "bootstrap/close"; - -// Components w/ JavaScript @import "bootstrap/modals"; @import "bootstrap/tooltip"; -// @import "bootstrap/popovers"; -// @import "bootstrap/carousel"; // Utility classes @import "bootstrap/utilities"; diff --git a/app/views/tags/_grouped_index.html.erb b/app/views/tags/_grouped_index.html.erb index a3be369b..f876c0e1 100644 --- a/app/views/tags/_grouped_index.html.erb +++ b/app/views/tags/_grouped_index.html.erb @@ -11,7 +11,7 @@
<%= count %>
- <%= link_to [post_type.pluralize, tag: tag] do %> + <%= link_to [post_type.pluralize.to_sym, tag: tag] do %> <%= glyph count == 1 ? :tag : :tags %> <%= tag %> <% end %> diff --git a/spec/controllers/transfers_controller_spec.rb b/spec/controllers/transfers_controller_spec.rb index f7b896cc..a034f778 100644 --- a/spec/controllers/transfers_controller_spec.rb +++ b/spec/controllers/transfers_controller_spec.rb @@ -28,13 +28,13 @@ it 'finds the destination account' do get :new, params: params - expect(response.body).to include("") + expect(response.body).to include("") end it 'builds a transfer with the id of the destination' do get :new, params: params expect(response.body) - .to include("") + .to include("") end context 'when the offer is specified' do @@ -47,7 +47,7 @@ it 'builds a transfer with the offer as post' do get :new, params: params.merge(offer: offer.id) - expect(response.body).to include("") + expect(response.body).to include("") end end @@ -94,13 +94,13 @@ it 'finds the destination account' do get :new, params: params - expect(response.body).to include("") + expect(response.body).to include("") end it 'builds a transfer with the id of the destination' do get :new, params: params expect(response.body) - .to include("") + .to include("") end context 'when the user is the admin of the current organization' do