Merge pull request #1652 from 18F/stages/rc-2017-09-04

Deploy rc-2017-09-04 to staging

.gitignore

@@ -50,11 +50,17 @@ Vagrantfile
 /kitchen/cookbooks
 /log/*
 /private_certs/*
+/public/*.ico
+/public/*.png
+/public/*.svg
+/public/browserconfig.xml
+/public/manifest.json
 /public/system
 /public/user_flows
 /spec/tmp
 /test
 /tmp/*
+/vendor/assets/fonts
 /vendor/bundle
 /node_modules
 

.reek

@@ -106,7 +106,6 @@ UtilityFunction:
     - WorkerHealthChecker::Middleware#call
     - UserEncryptedAttributeOverrides#create_fingerprint
     - LocaleHelper#locale_url_param
-    - Verify::Base#mock_vendor_partial
     - IdvSession#timed_out_vendor_error
 'app/controllers':
   InstanceVariableAssumption:
@@ -115,6 +114,7 @@ UtilityFunction:
   ControlParameter:
     exclude:
       - complete_idv_session
+      - visit_idp_from_sp_with_loa3
   DuplicateMethodCall:
     enabled: false
   FeatureEnvy:
@@ -137,7 +137,9 @@ UtilityFunction:
   UncommunicativeMethodName:
     exclude:
       - visit_idp_from_sp_with_loa1
+      - visit_idp_from_sp_with_loa3
       - visit_idp_from_mobile_app_with_loa1
+      - visit_idp_from_oidc_sp_with_loa3
   UncommunicativeParameterName:
     exclude:
       - begin_sign_up_with_sp_and_loa

.snyk

@@ -0,0 +1,10 @@
+version: v1.38.1
+ignore:
+  'SNYK-RUBY-NOKOGIRI-20299':
+    - '* > nokogiri':
+        reason: 'We do not opt in to DTDLOAD and do not opt out of NONET'
+        expires: '2018-01-01T00:00:00.000Z'
+  'SNYK-RUBY-ACTIONCABLE-20338':
+    - '* > actioncable':
+        reason: 'We do not use actioncable'
+        expires: '2017-09-10T00:00:00.000Z'

.travis.yml

@@ -14,6 +14,7 @@ before_install:
   - nvm install stable
   - nvm use stable
   - npm install
+  - npm run build
   # Install PhantomJS 2.1.1 manually
   - "export PHANTOMJS_VERSION=2.1.1"
   - "phantomjs --version"

Dockerfile

@@ -24,6 +24,7 @@ WORKDIR /upaya
 
 COPY package.json /upaya
 RUN npm install
+RUN npm run build
 
 COPY Gemfile /upaya
 COPY Gemfile.lock /upaya

Gemfile

@@ -3,7 +3,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby '~> 2.3.3'
 
-gem 'rails', '~> 4.2.6'
+gem 'rails', '~> 5.1.3'
 
 gem 'ahoy_matey'
 gem 'american_date'
@@ -12,7 +12,6 @@ gem 'base32-crockford'
 gem 'browserify-rails'
 gem 'device_detector'
 gem 'devise', '~> 4.1'
-gem 'devise_security_extension'
 gem 'dotiw'
 gem 'figaro'
 gem 'foundation_emails'
@@ -38,7 +37,7 @@ gem 'redis-session-store', github: '18F/redis-session-store', branch: 'master'
 gem 'rqrcode'
 gem 'ruby-progressbar'
 gem 'ruby-saml'
-gem 'saml_idp', git: 'https://github.com/18F/saml_idp.git', tag: 'v0.4.1-18f'
+gem 'saml_idp', git: 'https://github.com/18F/saml_idp.git', tag: 'v0.4.3-18f'
 gem 'sass-rails', '~> 5.0'
 gem 'savon'
 gem 'scrypt'
@@ -74,7 +73,6 @@ group :development do
   gem 'fasterer', require: false
   gem 'guard-rspec', require: false
   gem 'overcommit', require: false
-  gem 'quiet_assets'
   gem 'rack-mini-profiler', require: false
   gem 'rails-erd'
   gem 'rails_layout'
@@ -86,7 +84,6 @@ group :development, :test do
   gem 'bullet'
   gem 'front_matter_parser'
   gem 'i18n-tasks'
-  gem 'mailcatcher', require: false
   gem 'pry-byebug'
   gem 'rspec-rails', '~> 3.5.2'
   gem 'slim_lint'
@@ -106,8 +103,8 @@ group :test do
   gem 'poltergeist'
   gem 'rack-test'
   gem 'rack_session_access'
+  gem 'rails-controller-testing'
   gem 'shoulda-matchers', '~> 3.0', require: false
-  gem 'test_after_commit'
   gem 'timecop'
   gem 'webmock'
   gem 'zonebie'