Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade bootstrap gem #2063

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade bootstrap gem #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ gem "secure_headers", "~> 2.5.0"

# Frontend
gem "jquery-rails" # Javascript framework?
gem "bootstrap", "4.0.0.alpha4" # Bootstrap 4 - used for revised stylesheets (locked to current version)
gem "bootstrap", "4.6.0" # Bootstrap 4 - used for revised stylesheets (locked to current version)
gem "chartkick" # Display charts
gem "coderay" # Pretty print code
gem "coffee-rails"
Expand Down
37 changes: 17 additions & 20 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -94,8 +94,8 @@ GEM
api-pagination (4.8.2)
arel (9.0.0)
ast (2.4.2)
autoprefixer-rails (9.7.3)
execjs
autoprefixer-rails (10.3.1.0)
execjs (~> 2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
Expand All @@ -108,9 +108,10 @@ GEM
bcrypt (3.1.13)
bootsnap (1.4.5)
msgpack (~> 1.0)
bootstrap (4.0.0.alpha4)
autoprefixer-rails (>= 6.0.3)
sass (>= 3.4.19)
bootstrap (4.6.0)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
buftok (0.2.0)
builder (3.2.4)
bullet (6.0.2)
Expand All @@ -137,7 +138,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
connection_pool (2.2.3)
countries (3.1.0)
i18n_data (~> 0.11.0)
Expand Down Expand Up @@ -167,7 +168,7 @@ GEM
erubi (1.10.0)
eventmachine (1.2.7)
excon (0.76.0)
execjs (2.7.0)
execjs (2.8.1)
factory_bot (5.1.1)
activesupport (>= 4.2.0)
factory_bot_rails (5.1.1)
Expand All @@ -189,7 +190,7 @@ GEM
faraday_middleware (1.0.0)
faraday (~> 1.0)
fast_blank (1.0.0)
ffi (1.13.1)
ffi (1.15.3)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
Expand Down Expand Up @@ -349,7 +350,7 @@ GEM
railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
loofah (2.9.1)
loofah (2.12.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.8)
Expand All @@ -368,7 +369,7 @@ GEM
rake
mini_magick (4.9.5)
mini_mime (1.1.0)
mini_portile2 (2.5.0)
mini_portile2 (2.6.1)
minitest (5.14.4)
monetize (1.9.2)
money (~> 6.12)
Expand All @@ -389,8 +390,8 @@ GEM
naught (1.1.0)
nenv (0.3.0)
nio4r (2.5.7)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
nokogiri (1.12.3)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand Down Expand Up @@ -436,6 +437,7 @@ GEM
pg_search (2.3.0)
activerecord (>= 4.2)
activesupport (>= 4.2)
popper_js (1.16.0)
premailer (1.11.1)
addressable
css_parser (>= 1.6.0)
Expand Down Expand Up @@ -508,7 +510,7 @@ 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.1)
loofah (~> 2.3)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
Expand All @@ -520,7 +522,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.3)
rake (13.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -581,11 +583,6 @@ GEM
ruby2_keywords (0.0.4)
rubyzip (1.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
Expand Down Expand Up @@ -708,7 +705,7 @@ DEPENDENCIES
axlsx (~> 3.0.0.pre)
bcrypt (~> 3.1.7)
bootsnap
bootstrap (= 4.0.0.alpha4)
bootstrap (= 4.6.0)
bullet
bundler (>= 1.8.4)
carrierwave (~> 0.11.2)
Expand Down