Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gem "mysql2", "~> 0.4.10", :platform => :ruby
gem "font-awesome-rails" # required
gem "jquery-ui-rails"
gem "thinking-sphinx", "~> 4.0"
gem "bootstrap", "~> 4.1.1"
gem "bootstrap", "~> 4.3.1"
gem "tabler-rubygem"
gem "diffy", "~> 3.2"
gem "will_paginate"
Expand Down
36 changes: 23 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.4)
autoprefixer-rails (9.2.1)
autoprefixer-rails (10.2.4.0)
execjs
bcrypt (3.1.12)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap (4.1.3)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
builder (3.2.3)
byebug (10.0.2)
chunky_png (1.3.12)
Expand Down Expand Up @@ -76,7 +76,7 @@ GEM
rubyzip (~> 1.2, >= 1.2.1)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.25)
ffi (1.15.0)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
globalid (0.4.1)
Expand Down Expand Up @@ -110,7 +110,9 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
Expand All @@ -126,7 +128,7 @@ GEM
mime-types
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
popper_js (1.14.3)
popper_js (1.16.0)
rack (1.6.10)
rack-cors (1.0.2)
rack-protection (2.1.0)
Expand Down Expand Up @@ -158,9 +160,9 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (4.3.0)
redis (4.1.3)
responders (2.4.0)
Expand All @@ -175,7 +177,7 @@ GEM
rqrcode_core (~> 0.1)
rqrcode_core (0.1.2)
rubyzip (1.2.2)
sass (3.6.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -186,6 +188,14 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
Expand Down Expand Up @@ -240,7 +250,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap (~> 4.1.1)
bootstrap (~> 4.3.1)
byebug
ckeditor
coffee-rails (~> 4.1.0)
Expand Down