diff --git a/Gemfile b/Gemfile index 38c84fea4..96034e1a9 100644 --- a/Gemfile +++ b/Gemfile @@ -10,14 +10,14 @@ gem 'daemons' gem 'delayed_job_active_record' gem 'delayed_job_web' gem 'devise', '~> 4.2.0' -gem 'devise-encryptable' -gem 'draper' -gem 'sass-rails' +gem 'devise-encryptable', '>= 0.2.0' +gem 'draper', '>= 2.1.0' +gem 'sass-rails', '>= 5.0.5' gem 'bootstrap-sass' -gem 'haml-rails' +gem 'haml-rails', '>= 0.9.0' gem 'html2haml', '~> 2.2.0' -gem 'jquery-rails' -gem 'nokogiri', '1.8.2' +gem 'jquery-rails', '>= 4.1.1' +gem 'nokogiri', '1.10.5' gem 'loofah', '2.2.2' gem 'oauth2', '1.4.0' @@ -26,13 +26,13 @@ gem 'omniauth-google-oauth2', '0.5.3' gem 'omniauth-oauth2', '1.5.0' gem 'rack-protection', '1.5.5' -gem 'pivotal-tracker' -gem 'rails', '~> 4.2.6' -gem 'rails-dom-testing', '~> 1.0.8' +gem 'pivotal-tracker', '>= 0.5.13' +gem 'rails', '~> 4.2.7' +gem 'rails-dom-testing', '~> 1.0.9' gem 'rake' gem 'whenever', require: false -gem 'rails-backbone' -gem 'coffee-rails' +gem 'rails-backbone', '>= 1.2.0' +gem 'coffee-rails', '>= 4.2.1' gem 'eco' gem 'pg', '~> 0.11' gem 'eventmachine' @@ -44,7 +44,7 @@ gem 'clockwork' gem 'jbuilder' gem 'ruby-openid' gem 'kramdown' -gem 'lograge', '~> 0.4' +gem 'lograge', '~> 0.4', '>= 0.4.1' group :production do gem 'rails_12factor' @@ -65,17 +65,17 @@ group :development do gem 'better_errors' gem 'foreman' gem 'guard-ctags-bundler' - gem 'quiet_assets' + gem 'quiet_assets', '>= 1.1.0' end group :test, :development do gem 'awesome_print' gem 'launchy' gem 'jshint_on_rails' - gem 'rspec-rails' + gem 'rspec-rails', '>= 3.5.1' gem 'shoulda-matchers' gem 'jasmine' - gem 'factory_girl_rails' + gem 'factory_girl_rails', '>= 4.7.0' gem 'guard' gem 'database_cleaner' gem 'pry-nav' diff --git a/Gemfile.lock b/Gemfile.lock index 0ae1f7d7c..2c7ddbc2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,37 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) + 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.7) - actionview (= 4.2.7) - activesupport (= 4.2.7) + 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) - actionview (4.2.7) - activesupport (= 4.2.7) + 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.2) - activejob (4.2.7) - activesupport (= 4.2.7) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.7) - activesupport (= 4.2.7) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.7) - activemodel (= 4.2.7) - activesupport (= 4.2.7) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) - activesupport (4.2.7) + activesupport (4.2.11.1) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -42,11 +41,11 @@ GEM airbrake (4.3.8) builder multi_json - arel (6.0.3) + arel (6.0.4) autoprefixer-rails (6.3.7) execjs awesome_print (1.7.0) - bcrypt (3.1.11) + bcrypt (3.1.13) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -57,7 +56,7 @@ GEM bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.3) choices (0.4.0) hashie (>= 0.4.0) chronic (0.10.2) @@ -65,18 +64,18 @@ GEM activesupport tzinfo coderay (1.1.1) - coffee-rails (4.2.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) + coffee-script-source (1.12.2) + concurrent-ruby (1.1.5) cookiejar (0.3.3) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) daemons (1.2.4) database_cleaner (1.5.3) delayed_job (4.1.2) @@ -88,7 +87,7 @@ GEM activerecord (> 3.0.0) delayed_job (> 2.0.3) sinatra (>= 1.4.4) - devise (4.2.0) + devise (4.2.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -96,8 +95,8 @@ GEM warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) - diff-lcs (1.2.5) - domain_name (0.5.20160615) + diff-lcs (1.3) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) draper (2.1.0) actionpack (>= 3.0) @@ -125,10 +124,10 @@ GEM eventmachine (1.2.0.1) excon (0.51.0) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -136,8 +135,8 @@ GEM foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) guard (2.14.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -156,12 +155,13 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - haml (4.0.7) + haml (5.1.2) + temple (>= 0.8.0) tilt - haml-rails (0.9.0) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) + haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) hashdiff (0.3.0) @@ -178,7 +178,8 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-cookie (1.0.2) + http-accept (1.7.0) + http-cookie (1.0.3) domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (0.9.5) @@ -192,12 +193,12 @@ GEM jbuilder (2.5.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.1) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jshint_on_rails (1.0.3) - json (1.8.6) + json (2.2.0) jwt (1.5.6) kgio (2.10.0) kramdown (1.11.1) @@ -207,31 +208,33 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - lograge (0.4.1) - actionpack (>= 4, < 5.1) - activesupport (>= 4, < 5.1) - railties (>= 4, < 5.1) + lograge (0.11.2) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.8.2) - mime-types (3.1) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) - minitest (5.11.3) + mime-types-data (3.2019.1009) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) netrc (0.11.0) newrelic_rpm (3.16.0.318) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - nokogiri-happymapper (0.5.9) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + nokogiri-happymapper (0.8.1) nokogiri (~> 1.5) notiffany (0.1.0) nenv (~> 0.1) @@ -271,21 +274,21 @@ GEM pry (>= 0.9.10) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.9) + rack (1.6.11) rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7) - actionmailer (= 4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) - activemodel (= 4.2.7) - activerecord (= 4.2.7) - activesupport (= 4.2.7) + 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.7) + railties (= 4.2.11.1) sprockets-rails rails-backbone (1.2.0) coffee-rails @@ -298,60 +301,71 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.7) - actionpack (= 4.2.7) - activesupport (= 4.2.7) + 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) raindrops (0.16.0) - rake (12.3.1) + rake (13.0.1) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - request_store (1.3.1) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + request_store (1.4.1) + rack (>= 1.4) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) ruby-openid (2.7.0) ruby_dep (1.3.1) - ruby_parser (3.11.0) + ruby_parser (3.14.1) sexp_processor (~> 4.9) - safe_yaml (1.0.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sexp_processor (4.11.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.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + sexp_processor (4.13.0) shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) @@ -363,16 +377,17 @@ GEM spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.19.1) + temple (0.8.2) + thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) timecop (0.8.1) tzinfo (1.2.5) thread_safe (~> 0.1) @@ -380,13 +395,13 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.6) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) vagrant (1.5.0) vcr (3.0.3) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webmock (2.1.0) addressable (>= 2.3.6) @@ -407,55 +422,55 @@ DEPENDENCIES bourbon choices clockwork - coffee-rails + coffee-rails (>= 4.2.1) daemons database_cleaner delayed_job_active_record delayed_job_web devise (~> 4.2.0) - devise-encryptable - draper + devise-encryptable (>= 0.2.0) + draper (>= 2.1.0) eco em-http-request eventmachine - factory_girl_rails + factory_girl_rails (>= 4.7.0) foreman guard guard-ctags-bundler guard-livereload - haml-rails + haml-rails (>= 0.9.0) heroku_san html2haml (~> 2.2.0) jasmine jbuilder - jquery-rails + jquery-rails (>= 4.1.1) jshint_on_rails kramdown launchy - lograge (~> 0.4) + lograge (~> 0.4, >= 0.4.1) loofah (= 2.2.2) newrelic_rpm - nokogiri (= 1.8.2) + nokogiri (= 1.10.5) oauth2 (= 1.4.0) omniauth (~> 1.8.1) omniauth-google-oauth2 (= 0.5.3) omniauth-oauth2 (= 1.5.0) pg (~> 0.11) - pivotal-tracker + pivotal-tracker (>= 0.5.13) pry pry-nav pry-rails - quiet_assets + quiet_assets (>= 1.1.0) rack-protection (= 1.5.5) - rails (~> 4.2.6) - rails-backbone - rails-dom-testing (~> 1.0.8) + rails (~> 4.2.7) + rails-backbone (>= 1.2.0) + rails-dom-testing (~> 1.0.9) rails_12factor rake rb-fsevent - rspec-rails + rspec-rails (>= 3.5.1) ruby-openid - sass-rails + sass-rails (>= 5.0.5) shoulda-matchers spring spring-commands-rspec @@ -471,4 +486,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.16.5 + 1.17.3