Skip to content

Commit

Permalink
Merge pull request #3853 from 18F/stages/rc-2020-06-17-patch-1-prod
Browse files Browse the repository at this point in the history
Deploy RC 112.1 to prod
  • Loading branch information
zachmargolis authored Jun 18, 2020
2 parents 21200c5 + f015f23 commit b5a0a56
Show file tree
Hide file tree
Showing 191 changed files with 1,621 additions and 1,881 deletions.
6 changes: 0 additions & 6 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ plugins:
enabled: true
coffeelint:
enabled: true
csslint:
enabled: true
exclude_patterns:
- 'public/main.facf1c5e.chunk.css'
duplication:
enabled: true
config:
Expand All @@ -62,8 +58,6 @@ plugins:
- 'lib/rspec/formatters/user_flow_formatter.rb'
eslint:
enabled: true
exclude_patterns:
- 'public/idscan-go.js'
fixme:
enabled: true
exclude_patterns:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ Vagrantfile
/vendor/bundle
/postgres-data

package-lock.json

saml_*.txt
saml_*.shr
saml_*.key
Expand Down
7 changes: 5 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Metrics/LineLength:
- 'config/routes.rb'

Metrics/MethodLength:
Description: Avoid methods longer than 10 lines of code.
Description: Avoid methods longer than 15 lines of code.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
Enabled: true
CountComments: false
Max: 10
Max: 15
Exclude:
- 'db/migrate/*'
- spec/**/*
Expand Down Expand Up @@ -158,6 +158,9 @@ Layout/DotPosition:
- leading
- trailing

Style/DoubleNegation:
Enabled: false

# Warn on empty else statements
# empty - warn only on empty else
# nil - warn on else with nil in it
Expand Down
46 changes: 23 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '~> 2.6.5'

gem 'rails', '~> 5.2.4'
gem 'rails', '~> 5.2.4', '>= 5.2.4.3'

gem 'ahoy_matey', '~> 2.0'
gem 'ahoy_matey', '~> 2.2', '>= 2.2.1'
gem 'american_date'
gem 'aws-sdk-kms', '~> 1.4'
gem 'aws-sdk-ses', '~> 1.6'
gem 'base32-crockford'
gem 'device_detector'
gem 'devise', '~> 4.7.1'
gem 'dotiw'
gem 'exception_notification'
gem 'dotiw', '>= 4.0.1'
gem 'exception_notification', '>= 4.4.0'
gem 'figaro'
gem 'foundation_emails'
gem 'gibberish'
Expand All @@ -23,15 +23,15 @@ gem 'httparty'
gem 'identity-hostdata', github: '18F/identity-hostdata', branch: 'master'
gem 'identity-telephony', github: '18f/identity-telephony', tag: 'v0.1.2'
gem 'identity_validations', github: '18F/identity-validations', branch: 'master'
gem 'json-jwt'
gem 'json-jwt', '>= 1.11.0'
gem 'local_time'
gem 'lograge'
gem 'lograge', '>= 0.11.2'
gem 'maxminddb'
gem 'net-sftp'
gem 'newrelic_rpm'
gem 'pg'
gem 'phonelib'
gem 'premailer-rails'
gem 'premailer-rails', '>= 1.10.3'
gem 'proofer', github: '18F/identity-proofer-gem', tag: 'v2.7.0'
gem 'pry-doc'
gem 'pry-rails'
Expand All @@ -42,31 +42,31 @@ gem 'rack-timeout'
gem 'raise-if-root'
gem 'readthis'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'redis-session-store'
gem 'redis-session-store', '>= 0.11.1'
gem 'rotp', '~> 3.3.1'
gem 'rqrcode'
gem 'ruby-progressbar'
gem 'ruby-saml'
gem 'safe_target_blank'
gem 'safe_target_blank', '>= 1.0.2'
gem 'saml_idp', git: 'https://github.com/18F/saml_idp.git', branch: 'master'
gem 'sassc-rails', '~> 2.1.2'
gem 'scrypt'
gem 'secure_headers', '~> 6.3'
gem 'simple_form'
gem 'simple_form', '>= 5.0.1'
gem 'sinatra', require: false
gem 'slim-rails'
gem 'slim-rails', '>= 3.2.0'
gem 'stringex', require: false
gem 'strong_migrations'
gem 'strong_migrations', '>= 0.4.2'
gem 'subprocess', require: false
gem 'twilio-ruby'
gem 'two_factor_authentication'
gem 'two_factor_authentication', '>= 2.1.1'
gem 'typhoeus'
gem 'uglifier', '~> 3.2'
gem 'user_agent_parser'
gem 'valid_email'
gem 'valid_email', '>= 0.1.3'
gem 'webauthn', '~> 2.1.0'
gem 'webpacker', '~> 3.4'
gem 'xmlenc', '~> 0.6'
gem 'webpacker', '~> 3.6', '>= 3.6.0'
gem 'xmlenc', '~> 0.7', '>= 0.7.1'
gem 'zxcvbn-js'

group :development do
Expand All @@ -81,18 +81,18 @@ group :development do
gem 'octokit'
gem 'overcommit', require: false
gem 'rack-mini-profiler', require: false
gem 'rails-erd'
gem 'rails-erd', '>= 1.6.0'
end

group :development, :test do
gem 'bullet'
gem 'i18n-tasks'
gem 'bullet', '>= 6.0.2'
gem 'i18n-tasks', '>= 0.9.29'
gem 'knapsack'
gem 'parallel_tests'
gem 'pry-byebug'
gem 'psych'
gem 'puma'
gem 'rspec-rails', '~> 3.7'
gem 'rspec-rails', '~> 3.9', '>= 3.9.0'
gem 'rubocop', '~> 0.72.0', require: false
gem 'rubocop-rails', require: false
gem 'slim_lint'
Expand All @@ -105,12 +105,12 @@ group :test do
gem 'codeclimate-test-reporter', require: false
gem 'database_cleaner'
gem 'email_spec'
gem 'factory_bot_rails'
gem 'factory_bot_rails', '>= 5.1.1'
gem 'fakefs', require: 'fakefs/safe'
gem 'faker'
gem 'rack-test'
gem 'rack_session_access'
gem 'rails-controller-testing'
gem 'rails-controller-testing', '>= 1.0.4'
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'timecop'
gem 'webdrivers', '~> 3.0'
Expand All @@ -119,6 +119,6 @@ group :test do
end

group :production do
gem 'aamva', github: '18F/identity-aamva-api-client-gem', tag: 'v3.3.0'
gem 'aamva', github: '18F/identity-aamva-api-client-gem', tag: 'v3.4.0'
gem 'lexisnexis', github: '18F/identity-lexisnexis-api-client-gem', tag: 'v1.2.0'
end
Loading

0 comments on commit b5a0a56

Please sign in to comment.