reverse bootstrap upgrade
This commit is contained in:
153
Gemfile.lock
153
Gemfile.lock
@@ -8,7 +8,7 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rgrove/sanitize
|
||||
revision: 424f02f4fd279e650117d32388d0840097dbc4c9
|
||||
revision: dd466918ce5728acdc6f63d746fa898f8b366988
|
||||
specs:
|
||||
sanitize (5.0.0)
|
||||
crass (~> 1.0.2)
|
||||
@@ -18,39 +18,39 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activejob (= 4.2.11)
|
||||
actionmailer (4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activejob (= 4.2.11.1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
actionpack (4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionpack-action_caching (1.2.0)
|
||||
actionpack (>= 4.0.0, < 6)
|
||||
actionview (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
actionview (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
active_record_query_trace (1.5.4)
|
||||
activejob (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
active_record_query_trace (1.6.2)
|
||||
activejob (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
activemodel (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.11)
|
||||
activemodel (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
activerecord (4.2.11.1)
|
||||
activemodel (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.11)
|
||||
activesupport (4.2.11.1)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
@@ -59,12 +59,12 @@ GEM
|
||||
addressable (2.6.0)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
aes_key_wrap (1.0.1)
|
||||
annotate (2.7.4)
|
||||
activerecord (>= 3.2, < 6.0)
|
||||
annotate (2.7.5)
|
||||
activerecord (>= 3.2, < 7.0)
|
||||
rake (>= 10.4, < 13.0)
|
||||
arel (6.0.4)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (9.5.0)
|
||||
autoprefixer-rails (9.5.1.1)
|
||||
execjs
|
||||
awesome_nested_set (3.1.4)
|
||||
activerecord (>= 4.0.0, < 5.3)
|
||||
@@ -74,15 +74,13 @@ GEM
|
||||
railties (>= 3.1.0)
|
||||
blueimp-gallery-rails (2.7.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
bootstrap (4.3.1)
|
||||
autoprefixer-rails (>= 9.1.0)
|
||||
popper_js (>= 1.14.3, < 2)
|
||||
sassc-rails (>= 2.0.0)
|
||||
bootstrap-addons-rails (0.1.2)
|
||||
rails
|
||||
bootstrap-sass (2.3.2.2)
|
||||
sass (~> 3.2)
|
||||
builder (3.2.3)
|
||||
cancan (1.6.10)
|
||||
capybara (3.13.2)
|
||||
capybara (3.18.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (~> 1.8)
|
||||
@@ -103,9 +101,9 @@ GEM
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
concurrent-ruby (1.1.4)
|
||||
concurrent-ruby (1.1.5)
|
||||
crass (1.0.4)
|
||||
devise (4.6.1)
|
||||
devise (4.6.2)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 6.0)
|
||||
@@ -122,8 +120,8 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
factory_bot (5.0.2)
|
||||
activesupport (>= 4.2.0)
|
||||
factory_bot_rails (5.0.1)
|
||||
factory_bot (~> 5.0.0)
|
||||
factory_bot_rails (5.0.2)
|
||||
factory_bot (~> 5.0.2)
|
||||
railties (>= 4.2.0)
|
||||
faraday (0.15.4)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
@@ -133,8 +131,8 @@ GEM
|
||||
rack-oauth2 (>= 0.14.4)
|
||||
tzinfo
|
||||
ffi (1.10.0)
|
||||
font-awesome-rails (4.7.0.4)
|
||||
railties (>= 3.2, < 6.0)
|
||||
font-awesome-rails (4.7.0.5)
|
||||
railties (>= 3.2, < 6.1)
|
||||
formtastic (3.1.5)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic-bootstrap (3.0.0)
|
||||
@@ -146,18 +144,18 @@ GEM
|
||||
activemodel (>= 4.2, < 5.3)
|
||||
activerecord (>= 4.2, < 5.3)
|
||||
request_store (~> 1.0)
|
||||
globalize-accessors (0.1.5)
|
||||
globalize (>= 3)
|
||||
globalize-versioning (0.2.0)
|
||||
activemodel (>= 3.2.0, < 5)
|
||||
activerecord (>= 3.2.0, < 5)
|
||||
globalize (>= 3.0.4, < 6)
|
||||
paper_trail (>= 3.0.0, < 5)
|
||||
globalize-accessors (0.2.1)
|
||||
globalize (~> 5.0, >= 5.0.0)
|
||||
globalize-versioning (0.3.0)
|
||||
activemodel (>= 4.2.0, < 6)
|
||||
activerecord (>= 4.2.0, < 6)
|
||||
globalize (>= 5.1.0, < 6)
|
||||
paper_trail (>= 8, < 12)
|
||||
haml (5.0.4)
|
||||
temple (>= 0.8.0)
|
||||
tilt
|
||||
hashie (3.6.0)
|
||||
highline (2.0.1)
|
||||
highline (2.0.2)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
@@ -174,8 +172,8 @@ GEM
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (6.0.1)
|
||||
railties (>= 3.2.16)
|
||||
json (2.1.0)
|
||||
json-jwt (1.10.0)
|
||||
json (2.2.0)
|
||||
json-jwt (1.10.1)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
bindata
|
||||
@@ -192,7 +190,7 @@ GEM
|
||||
activerecord
|
||||
kaminari-core (= 1.1.1)
|
||||
kaminari-core (1.1.1)
|
||||
libv8 (6.7.288.46.1)
|
||||
libv8 (7.3.492.27.1)
|
||||
loofah (2.2.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
@@ -202,20 +200,20 @@ GEM
|
||||
actionpack (>= 3.2.0, < 6.1)
|
||||
mime-types (3.2.2)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2018.0812)
|
||||
mime-types-data (3.2019.0331)
|
||||
mimemagic (0.3.3)
|
||||
mini_mime (1.0.1)
|
||||
mini_portile2 (2.4.0)
|
||||
mini_racer (0.2.4)
|
||||
libv8 (>= 6.3)
|
||||
mini_racer (0.2.5)
|
||||
libv8 (>= 6.9.411)
|
||||
minitest (5.11.3)
|
||||
multi_json (1.13.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
multipart-post (2.1.0)
|
||||
mysql2 (0.5.2)
|
||||
net-ldap (0.16.1)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.10.1)
|
||||
nokogiri (1.10.3)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.1)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
@@ -243,9 +241,8 @@ GEM
|
||||
nokogiri
|
||||
options (2.3.2)
|
||||
orm_adapter (0.5.0)
|
||||
paper_trail (4.2.0)
|
||||
activerecord (>= 3.0, < 6.0)
|
||||
activesupport (>= 3.0, < 6.0)
|
||||
paper_trail (10.3.0)
|
||||
activerecord (>= 4.2, < 6.1)
|
||||
request_store (~> 1.1)
|
||||
paperclip (6.1.0)
|
||||
activemodel (>= 4.2.0)
|
||||
@@ -253,7 +250,6 @@ GEM
|
||||
mime-types
|
||||
mimemagic (~> 0.3.0)
|
||||
terrapin (~> 0.6.0)
|
||||
popper_js (1.14.5)
|
||||
pr_geohash (1.0.0)
|
||||
progress_bar (1.3.0)
|
||||
highline (>= 1.6, < 3)
|
||||
@@ -261,7 +257,7 @@ GEM
|
||||
protected_attributes (1.1.4)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
public_suffix (3.0.3)
|
||||
puma (3.12.0)
|
||||
puma (3.12.1)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
rack (1.6.11)
|
||||
rack-oauth2 (1.9.3)
|
||||
@@ -272,16 +268,16 @@ GEM
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.11)
|
||||
actionmailer (= 4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activejob (= 4.2.11)
|
||||
activemodel (= 4.2.11)
|
||||
activerecord (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
rails (4.2.11.1)
|
||||
actionmailer (= 4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activejob (= 4.2.11.1)
|
||||
activemodel (= 4.2.11.1)
|
||||
activerecord (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.11)
|
||||
railties (= 4.2.11.1)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
@@ -291,16 +287,16 @@ GEM
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
railties (4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
railties (4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (12.3.2)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.10.0)
|
||||
ffi (~> 1.0)
|
||||
regexp_parser (1.3.0)
|
||||
regexp_parser (1.4.0)
|
||||
request_store (1.4.1)
|
||||
rack (>= 1.4)
|
||||
responders (2.4.1)
|
||||
@@ -310,7 +306,7 @@ GEM
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rmagick (2.16.0)
|
||||
rmagick (3.1.0)
|
||||
rolify (5.2.0)
|
||||
rsolr (2.2.1)
|
||||
builder (>= 2.1.2)
|
||||
@@ -327,7 +323,7 @@ GEM
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (3.8.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-expectations (3.8.2)
|
||||
rspec-expectations (3.8.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-html-matchers (0.9.1)
|
||||
@@ -347,7 +343,7 @@ GEM
|
||||
rspec-support (3.8.0)
|
||||
rubyntlm (0.3.4)
|
||||
rubyzip (1.2.2)
|
||||
sass (3.7.3)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
@@ -361,12 +357,6 @@ GEM
|
||||
sassc (2.0.1)
|
||||
ffi (~> 1.9)
|
||||
rake
|
||||
sassc-rails (2.1.0)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
seed_dump (3.3.1)
|
||||
activerecord (>= 4)
|
||||
activesupport (>= 4)
|
||||
@@ -400,7 +390,7 @@ GEM
|
||||
sunspot_test (0.4.1)
|
||||
sunspot_rails (>= 2.1.1)
|
||||
sunspot_solr
|
||||
temple (0.8.0)
|
||||
temple (0.8.1)
|
||||
terrapin (0.6.0)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
themes_on_rails (0.4.0)
|
||||
@@ -416,11 +406,11 @@ GEM
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.5)
|
||||
unf_ext (0.0.7.6)
|
||||
warden (1.2.7)
|
||||
rack (>= 1.0)
|
||||
webrick (1.4.2)
|
||||
whenever (0.10.0)
|
||||
whenever (0.11.0)
|
||||
chronic (>= 0.6.3)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
@@ -436,12 +426,13 @@ DEPENDENCIES
|
||||
active_record_query_trace
|
||||
acts_as_votable
|
||||
annotate
|
||||
autoprefixer-rails
|
||||
awesome_nested_set
|
||||
blueimp-gallery
|
||||
blueimp-gallery-rails
|
||||
bootstrap
|
||||
bootstrap-addons-rails
|
||||
bootstrap-kaminari-views!
|
||||
bootstrap-sass (~> 2.3.0)
|
||||
cancan
|
||||
capybara
|
||||
carrierwave
|
||||
@@ -490,7 +481,7 @@ DEPENDENCIES
|
||||
rspec-support
|
||||
rubyzip
|
||||
sanitize!
|
||||
sass-rails (~> 5.0)
|
||||
sass-rails
|
||||
seed_dump
|
||||
shareable
|
||||
simple_calendar
|
||||
|
||||
Reference in New Issue
Block a user