Skip to content
Snippets Groups Projects
Commit 52f7c90b authored by azul's avatar azul
Browse files

Merge branch 'update/dependencies' into 'master' 

Update/dependencies

See merge request riseuplabs/crabgrass!303
parents 7ade6b83 e7836a30
Branches
No related tags found
1 merge request!303Update/dependencies
Show whitespace changes
Inline Side-by-side
Gemfile
+ 4
− 4
View file @ 52f7c90b
...@@ -8,7 +8,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ...@@ -8,7 +8,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
## ##
# Rails is the framework we use. # Rails is the framework we use.
gem 'rails', '~> 5.2.3' gem 'rails', '~> 5.2.4'
# Security updates # Security updates
#https://github.com/sparklemotion/nokogiri/issues/1892 #https://github.com/sparklemotion/nokogiri/issues/1892
...@@ -16,7 +16,7 @@ gem 'nokogiri', '~> 1.10.3' ...@@ -16,7 +16,7 @@ gem 'nokogiri', '~> 1.10.3'
# Rake is rubys make... performing tasks # Rake is rubys make... performing tasks
# locking in to latest major to fix API # locking in to latest major to fix API
gem 'rake', '~> 10.0', require: false gem 'rake', '~> 12.3', require: false
# Application preloader for faster start time # Application preloader for faster start time
gem 'spring', group: :development gem 'spring', group: :development
...@@ -33,7 +33,7 @@ gem 'mysql2', '~> 0.5.2' ...@@ -33,7 +33,7 @@ gem 'mysql2', '~> 0.5.2'
# parsing and generating JSON # parsing and generating JSON
# locking in to latest major to fix API # locking in to latest major to fix API
gem 'json', '~> 1.8' gem 'json', '~> 2.3'
# Markup language that uses indent to indicate nesting # Markup language that uses indent to indicate nesting
# locking in to latest major to fix API # locking in to latest major to fix API
...@@ -85,7 +85,7 @@ gem 'pundit', '~> 1.1' ...@@ -85,7 +85,7 @@ gem 'pundit', '~> 1.1'
# Bcrypt for has_secure_password # Bcrypt for has_secure_password
gem 'bcrypt', '~> 3.1.7' gem 'bcrypt', '~> 3.1.7'
gem 'secure_headers', '~> 4.0.2' gem 'secure_headers', '~> 5.2'
# ? # ?
# locking in to latest major to fix API # locking in to latest major to fix API
......
Gemfile.lock
+ 72
− 72
View file @ 52f7c90b
...@@ -17,45 +17,45 @@ GEM ...@@ -17,45 +17,45 @@ GEM
specs: specs:
RedCloth (4.3.2) RedCloth (4.3.2)
aasm (3.4.0) aasm (3.4.0)
actioncable (5.2.3) actioncable (5.2.4.2)
actionpack (= 5.2.3) actionpack (= 5.2.4.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.3) actionmailer (5.2.4.2)
actionpack (= 5.2.3) actionpack (= 5.2.4.2)
actionview (= 5.2.3) actionview (= 5.2.4.2)
activejob (= 5.2.3) activejob (= 5.2.4.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.3) actionpack (5.2.4.2)
actionview (= 5.2.3) actionview (= 5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
rack (~> 2.0) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.1.1) actionpack-page_caching (1.1.1)
actionpack (>= 4.0.0, < 6) actionpack (>= 4.0.0, < 6)
actionview (5.2.3) actionview (5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3) activejob (5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.3) activemodel (5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
activerecord (5.2.3) activerecord (5.2.4.2)
activemodel (= 5.2.3) activemodel (= 5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
arel (>= 9.0) arel (>= 9.0)
activestorage (5.2.3) activestorage (5.2.4.2)
actionpack (= 5.2.3) actionpack (= 5.2.4.2)
activerecord (= 5.2.3) activerecord (= 5.2.4.2)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (5.2.3) activesupport (5.2.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -69,9 +69,9 @@ GEM ...@@ -69,9 +69,9 @@ GEM
arel (9.0.0) arel (9.0.0)
bcrypt (3.1.13) bcrypt (3.1.13)
bindex (0.8.1) bindex (0.8.1)
bootsnap (1.4.5) bootsnap (1.4.6)
msgpack (~> 1.0) msgpack (~> 1.0)
builder (3.2.3) builder (3.2.4)
bundler-audit (0.6.1) bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (~> 0.18) thor (~> 0.18)
...@@ -86,11 +86,11 @@ GEM ...@@ -86,11 +86,11 @@ GEM
xpath (~> 3.2) xpath (~> 3.2)
chronic (0.10.2) chronic (0.10.2)
cliver (0.3.2) cliver (0.3.2)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.6)
crabgrass_media (0.3.1) crabgrass_media (0.3.1)
activesupport (~> 5.0) activesupport (~> 5.0)
mime-types (~> 3.1) mime-types (~> 3.1)
crass (1.0.5) crass (1.0.6)
daemons (1.3.1) daemons (1.3.1)
delayed_job (4.1.8) delayed_job (4.1.8)
activesupport (>= 3.0, < 6.1) activesupport (>= 3.0, < 6.1)
...@@ -101,17 +101,17 @@ GEM ...@@ -101,17 +101,17 @@ GEM
erubi (1.9.0) erubi (1.9.0)
erubis (2.7.0) erubis (2.7.0)
execjs (2.7.0) execjs (2.7.0)
factory_bot (5.1.1) factory_bot (5.1.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
factory_bot_rails (5.1.1) factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0) factory_bot (~> 5.1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
faker (1.0.1) faker (1.0.1)
i18n (~> 0.4) i18n (~> 0.4)
ffi (1.11.2) ffi (1.12.2)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gpgme (2.0.19) gpgme (2.0.20)
mini_portile2 (~> 2.3) mini_portile2 (~> 2.3)
haml (5.1.2) haml (5.1.2)
temple (>= 0.8.0) temple (>= 0.8.0)
...@@ -133,9 +133,9 @@ GEM ...@@ -133,9 +133,9 @@ GEM
innertube (1.1.0) innertube (1.1.0)
joiner (0.4.2) joiner (0.4.2)
activerecord (>= 5.2.beta1) activerecord (>= 5.2.beta1)
json (1.8.6) json (2.3.0)
libv8 (3.16.14.19) libv8 (3.16.14.19)
loofah (2.3.1) loofah (2.5.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
...@@ -145,19 +145,19 @@ GEM ...@@ -145,19 +145,19 @@ GEM
mail (~> 2.5, >= 2.5.3) mail (~> 2.5, >= 2.5.3)
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
method_source (0.9.2) method_source (1.0.0)
middleware (0.1.0) middleware (0.1.0)
mime-types (3.3) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009) mime-types-data (3.2019.1009)
mimemagic (0.3.3) mimemagic (0.3.4)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.10.3) minitest (5.10.3)
msgpack (1.3.1) msgpack (1.3.3)
mysql2 (0.5.2) mysql2 (0.5.3)
nio4r (2.5.2) nio4r (2.5.2)
nokogiri (1.10.5) nokogiri (1.10.9)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
phantomjs-binaries (2.1.1.1) phantomjs-binaries (2.1.1.1)
sys-uname (= 0.9.0) sys-uname (= 0.9.0)
...@@ -165,24 +165,24 @@ GEM ...@@ -165,24 +165,24 @@ GEM
capybara (>= 2.1, < 4) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
public_suffix (4.0.1) public_suffix (4.0.4)
pundit (1.1.0) pundit (1.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rack (2.0.7) rack (2.2.2)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.2.3) rails (5.2.4.2)
actioncable (= 5.2.3) actioncable (= 5.2.4.2)
actionmailer (= 5.2.3) actionmailer (= 5.2.4.2)
actionpack (= 5.2.3) actionpack (= 5.2.4.2)
actionview (= 5.2.3) actionview (= 5.2.4.2)
activejob (= 5.2.3) activejob (= 5.2.4.2)
activemodel (= 5.2.3) activemodel (= 5.2.4.2)
activerecord (= 5.2.3) activerecord (= 5.2.4.2)
activestorage (= 5.2.3) activestorage (= 5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.3) railties (= 5.2.4.2)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4) rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x) actionpack (>= 5.0.1.x)
...@@ -193,23 +193,23 @@ GEM ...@@ -193,23 +193,23 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
railties (5.2.3) railties (5.2.4.2)
actionpack (= 5.2.3) actionpack (= 5.2.4.2)
activesupport (= 5.2.3) activesupport (= 5.2.4.2)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
rake (10.5.0) rake (12.3.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rdoc (6.2.0) rdoc (6.2.0)
record_tag_helper (1.0.0) record_tag_helper (1.0.1)
actionview (~> 5.x) actionview (>= 5)
ref (2.0.0) ref (2.0.0)
regexp_parser (1.6.0) regexp_parser (1.7.0)
riddle (2.4.0) riddle (2.4.2)
ruby_parser (3.14.1) ruby_parser (3.14.2)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
rubyzip (1.3.0) rubyzip (1.3.0)
sass (3.7.4) sass (3.7.4)
...@@ -217,11 +217,11 @@ GEM ...@@ -217,11 +217,11 @@ GEM
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
sdoc (1.0.0) sdoc (1.1.0)
rdoc (>= 5.0) rdoc (>= 5.0)
secure_headers (4.0.2) secure_headers (5.2.0)
useragent (>= 0.15.0) useragent (>= 0.15.0)
sexp_processor (4.13.0) sexp_processor (4.14.1)
simplecov (0.17.1) simplecov (0.17.1)
docile (~> 1.1) docile (~> 1.1)
json (>= 1.8, < 3) json (>= 1.8, < 3)
...@@ -236,7 +236,7 @@ GEM ...@@ -236,7 +236,7 @@ GEM
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.1) sqlite3 (1.4.2)
sys-uname (0.9.0) sys-uname (0.9.0)
ffi (>= 1.0.0) ffi (>= 1.0.0)
temple (0.8.2) temple (0.8.2)
...@@ -257,12 +257,12 @@ GEM ...@@ -257,12 +257,12 @@ GEM
activerecord (>= 2.0) activerecord (>= 2.0)
delayed_job delayed_job
thinking-sphinx (>= 1.5.0) thinking-sphinx (>= 1.5.0)
tzinfo (1.2.5) tzinfo (1.2.7)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
useragent (0.16.10) useragent (0.16.10)
utf8-cleaner (0.2.5) utf8-cleaner (1.0.0)
activesupport activesupport
validates_email_format_of (1.6.3) validates_email_format_of (1.6.3)
i18n i18n
...@@ -276,7 +276,7 @@ GEM ...@@ -276,7 +276,7 @@ GEM
websocket-extensions (0.1.4) websocket-extensions (0.1.4)
whenever (1.0.0) whenever (1.0.0)
chronic (>= 0.6.3) chronic (>= 0.6.3)
will_paginate (3.2.1) will_paginate (3.3.0)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zip-zip (0.3) zip-zip (0.3)
...@@ -306,7 +306,7 @@ DEPENDENCIES ...@@ -306,7 +306,7 @@ DEPENDENCIES
haml-rails (~> 1.0) haml-rails (~> 1.0)
http_accept_language (~> 2.0) http_accept_language (~> 2.0)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.8) json (~> 2.3)
mail-gpg (~> 0.3.3) mail-gpg (~> 0.3.3)
mime-types mime-types
minitest (~> 5.10.3) minitest (~> 5.10.3)
...@@ -316,14 +316,14 @@ DEPENDENCIES ...@@ -316,14 +316,14 @@ DEPENDENCIES
poltergeist (~> 1.5) poltergeist (~> 1.5)
prototype-rails! prototype-rails!
pundit (~> 1.1) pundit (~> 1.1)
rails (~> 5.2.3) rails (~> 5.2.4)
rails-controller-testing rails-controller-testing
rake (~> 10.0) rake (~> 12.3)
record_tag_helper (~> 1.0) record_tag_helper (~> 1.0)
rubyzip (~> 1.3) rubyzip (~> 1.3)
sass sass
sdoc sdoc
secure_headers (~> 4.0.2) secure_headers (~> 5.2)
simplecov simplecov
spring spring
sqlite3 sqlite3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment