Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
f448ae9
Set default URL options
monfresh Aug 4, 2017
995795f
Fix Rubocop spacing issue
monfresh Aug 7, 2017
0d3b557
Merge pull request #1591 from 18F/mb-default-urls
monfresh Aug 7, 2017
0a756fc
Update OIDC Logout to work with expired id_tokens
zachmargolis Aug 7, 2017
10a4478
Update bummr from 0.1.8 to 0.2.1
monfresh Aug 8, 2017
1779656
Update dotiw from 3.1.1 to 4.0.0
monfresh Aug 8, 2017
d5bb4e1
Update faker from 1.7.3 to 1.8.4
monfresh Aug 8, 2017
8a98b37
Update front_matter_parser from 0.1.0 to 0.1.1
monfresh Aug 8, 2017
f6ee7dd
Update hashie from 3.5.5 to 3.5.6
monfresh Aug 8, 2017
76026ad
Update http_accept_language from 2.1.0 to 2.1.1
monfresh Aug 8, 2017
93ee23f
Update httparty from 0.15.4 to 0.15.6
monfresh Aug 8, 2017
0671294
Update i18n-tasks from 0.9.15 to 0.9.16
monfresh Aug 8, 2017
339b4be
Update lograge from 0.5.1 to 0.6.0
monfresh Aug 8, 2017
f55ed27
Update newrelic_rpm from 4.2.0.334 to 4.3.0.335
monfresh Aug 8, 2017
f4f1ce4
Update overcommit from 0.39.1 to 0.40.0
monfresh Aug 8, 2017
926a8fd
Update phonelib from 0.6.12 to 0.6.13
monfresh Aug 8, 2017
73b3618
Update poltergeist from 1.15.0 to 1.16.0
monfresh Aug 8, 2017
3abc3ca
Update premailer-rails from 1.9.6 to 1.9.7
monfresh Aug 8, 2017
f3caafb
Update rails from 4.2.8 to 4.2.9
monfresh Aug 8, 2017
f1a05d7
Update reek from 4.7.1 to 4.7.2
monfresh Aug 8, 2017
7da7194
Update savon from 2.11.1 to 2.11.2
monfresh Aug 8, 2017
1fece21
Update shoulda-matchers from 3.1.1 to 3.1.2
monfresh Aug 8, 2017
123ec18
Update sidekiq from 5.0.3 to 5.0.4
monfresh Aug 8, 2017
57f8535
Update timecop from 0.9.0 to 0.9.1
monfresh Aug 8, 2017
1f2cbf8
Update zxcvbn-js from 4.4.2 to 4.4.3
monfresh Aug 8, 2017
17858bb
Fix linter offenses
monfresh Aug 8, 2017
2ccc3c8
Merge pull request #1594 from 18F/mb-update-gems
monfresh Aug 8, 2017
8be8a54
Merge pull request #1592 from 18F/margolis-handle-expired-id-token-hint
zachmargolis Aug 8, 2017
c3874fe
Move tests for max idv attempts to shared example
jmhooper Aug 7, 2017
2d75fea
Merge pull request #1593 from 18F/jmhooper-max-attempts-shared-examples
jmhooper Aug 9, 2017
16e52f4
Merge pull request #1595 from 18F/mb-fix-rubocop-offenses
monfresh Aug 9, 2017
07c7a71
Update twilio-ruby from 4.13.0 to 5.1.0
monfresh Aug 9, 2017
7389d17
Remove mailcatcher from Gemfile
monfresh Aug 9, 2017
758a8b0
Improve accessibility of language selector
hursey013 Aug 9, 2017
c00b3a3
Merge pull request #1598 from 18F/bh-language-a11y-tweak
zachmargolis Aug 9, 2017
84d5294
Make phone step re-entrant
jmhooper Aug 8, 2017
8cb24fb
Merge pull request #1597 from 18F/jmhooper-re-entrant-phone-form
jmhooper Aug 9, 2017
373bf85
Merge pull request #1599 from 18F/mb-remove-mailcatcher
monfresh Aug 10, 2017
ccab337
Update aws-sdk-core from 2.10.1 to 2.10.23
monfresh Aug 10, 2017
0317e47
Update axe-matchers from 1.3.3 to 1.3.4
monfresh Aug 10, 2017
dc8b605
Update better_errors from 2.1.1 to 2.3.0
monfresh Aug 10, 2017
a74b2b6
Update brakeman from 3.6.2 to 3.7.0
monfresh Aug 10, 2017
9ffe7d9
Update bullet from 5.5.1 to 5.6.1
monfresh Aug 10, 2017
17c21bd
Update secure_headers from 3.6.5 to 3.6.7
monfresh Aug 10, 2017
abc8b95
Update thin from 1.5.1 to 1.7.2
monfresh Aug 10, 2017
a46760b
Merge pull request #1596 from 18F/mb-update-twilio-ruby
monfresh Aug 10, 2017
5d2b9f5
Preserve query params when using language selector
hursey013 Aug 10, 2017
57d3161
Merge pull request #1601 from 18F/bh-preserve-params-language
hursey013 Aug 10, 2017
9dbc642
Merge pull request #1600 from 18F/mb-update-gems
monfresh Aug 10, 2017
bd85201
Remove quiet_assets gem
monfresh Aug 10, 2017
579655a
Update Rails from 4.2.9. to 5.0.5
monfresh Aug 10, 2017
35fa19f
Merge pull request #1603 from 18F/mb-update-rails
monfresh Aug 10, 2017
b12db8a
Update French translations
hursey013 Aug 11, 2017
538a437
Normalize yaml
hursey013 Aug 11, 2017
cf3d066
Merge pull request #1604 from 18F/bh-update-fr
hursey013 Aug 11, 2017
0af7a68
Update YamlNormalizer to handle arrays of hashes
zachmargolis Aug 11, 2017
4576315
Explicitly give PEM data to saml_idp gem
zachmargolis Aug 11, 2017
0f2c16f
Fix deprecation warnings for Rails 5.1
monfresh Aug 10, 2017
7bae03c
Merge pull request #1607 from 18F/mb-rails-5-deprecations
monfresh Aug 12, 2017
3f16d61
Merge pull request #1608 from 18F/margolis-explicit-pem-data
monfresh Aug 12, 2017
0637eae
Merge pull request #1606 from 18F/margolis-update-yaml-normalize
monfresh Aug 12, 2017
1961656
Allow OTP delivery method selection during IdV
jmhooper Aug 9, 2017
da1d252
Merge pull request #1605 from 18F/jmhooper-idv-otp-delivery-method-se…
jmhooper Aug 14, 2017
e7f2971
Fix setup script to work with Rails 5 changes
monfresh Aug 15, 2017
7f243e6
Merge pull request #1611 from 18F/mb-fix-setup
monfresh Aug 15, 2017
dc83285
Align OTP radio buttons
hursey013 Aug 15, 2017
78ed30d
Merge pull request #1613 from 18F/bh-align-radios
hursey013 Aug 15, 2017
f3fc3a1
Fix leftover deprecation warnings in spec
jmhooper Aug 15, 2017
0a14a98
Re-add mailcatcher to Procfile
jmhooper Aug 15, 2017
8771844
Remove redundant PII warning
jmhooper Aug 15, 2017
f272eaa
Update saml_idp from 0.4.1-18f to 0.4.2-18f
monfresh Aug 15, 2017
bb68829
Merge pull request #1612 from 18F/jmhooper-remove-redundant-message
jmhooper Aug 15, 2017
1abbc7d
Merge pull request #1615 from 18F/jmhooper-fix-deprecation-warning
jmhooper Aug 15, 2017
4d4a69c
Merge pull request #1617 from 18F/mb-update-saml-idp
monfresh Aug 15, 2017
a464993
Merge pull request #1616 from 18F/jmhooper-fix-mailcatcher
jmhooper Aug 16, 2017
913ac58
Add validation error when mail OTP is expired
jmhooper Aug 15, 2017
e3e76f7
Merge pull request #1614 from 18F/jmhooper-mail-otp-expiration
jmhooper Aug 16, 2017
b261146
Fix flickering IdV flow spec
jmhooper Aug 16, 2017
50c64ec
Merge pull request #1618 from 18F/jmhooper-fix-re-entrant-phone-step-…
jmhooper Aug 16, 2017
2a41c46
Add an error page for bad SAML requests
zachmargolis Aug 11, 2017
1782015
Use NPM style guide package
hursey013 Aug 16, 2017
4da14fc
Remove dependency on devise_security_extension
monfresh Aug 17, 2017
6710747
Merge pull request #1619 from 18F/bh-style-guide-again
hursey013 Aug 17, 2017
15d3938
Merge pull request #1610 from 18F/margolis-saml-error-page
zachmargolis Aug 17, 2017
35b7e4f
Merge pull request #1621 from 18F/mb-limit-concurrent-sessions
monfresh Aug 17, 2017
3f1445e
Update redis-session-store gem
monfresh Aug 16, 2017
591517a
Update Rails from 5.0.5 to 5.1.3
monfresh Aug 16, 2017
c04a99b
Merge pull request #1625 from 18F/mb-update-redis-session-store
monfresh Aug 18, 2017
26b4e5d
Fix <title> tag double HTML escaping
zachmargolis Aug 18, 2017
21e0094
Import stylesheets from style-guide
hursey013 Aug 17, 2017
79fc629
Merge pull request #1626 from 18F/margolis-fix-title-interpolation
zachmargolis Aug 18, 2017
38e0c1d
Merge pull request #1622 from 18F/bh-remove-styles
hursey013 Aug 18, 2017
92e91c4
Upgrade saml_idp gem
zachmargolis Aug 18, 2017
ac6684f
Merge pull request #1627 from 18F/margolis-upgrade-saml-idp
zachmargolis Aug 21, 2017
4c53f13
Move _tag helpers into the template
zachmargolis Aug 25, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion .reek
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -115,6 +114,7 @@ UtilityFunction:
ControlParameter:
exclude:
- complete_idv_session
- visit_idp_from_sp_with_loa3
DuplicateMethodCall:
enabled: false
FeatureEnvy:
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -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'
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ WORKDIR /upaya

COPY package.json /upaya
RUN npm install
RUN npm run build

COPY Gemfile /upaya
COPY Gemfile.lock /upaya
Expand Down
9 changes: 3 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
Loading