Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
ed5ff71
Update link to Help Center question
zachmargolis Jun 14, 2017
228bc62
Merge pull request #1485 from 18F/margolis-help-url
zachmargolis Jun 14, 2017
8ccbce9
Update timeout modal style
hursey013 Jun 14, 2017
9cf0b03
Add controller/routes/view/specs for personal key
el-mapache Jun 5, 2017
81a99ee
Merge pull request #1483 from 18F/ab-two-step-reactivate-account
el-mapache Jun 14, 2017
5c451fc
Update en.yml
jeanninehunter Jun 14, 2017
37fbe92
Merge pull request #1489 from 18F/jh-updatepasswordmessage
zachmargolis Jun 14, 2017
3243938
Updated intro for password reset
jeanninehunter Jun 14, 2017
1f5897b
Update SAML SP URLs for RRB
blacktm Jun 14, 2017
8f51d45
Improve defensiveness of logout logic
monfresh Jun 14, 2017
a51222a
Merge pull request #1492 from 18F/mb-oidc-logout
monfresh Jun 14, 2017
e110e94
Merge pull request #1490 from 18F/jh-psswrdresetupdate
monfresh Jun 14, 2017
20d7eb3
Merge pull request #1491 from 18F/rrb-update-sp-urls
monfresh Jun 14, 2017
6cae8be
Update svg and add desktop breakpoint
hursey013 Jun 14, 2017
74493b9
Merge pull request #1486 from 18F/bh-update-timeout-modal
hursey013 Jun 15, 2017
a801603
Update IdV to work with Equifax
monfresh Jun 16, 2017
d272dff
Merge pull request #1493 from 18F/mb-vendor-validation
monfresh Jun 17, 2017
7442716
Handle invalid OIDC requests before persisting
zachmargolis Jun 19, 2017
ccbbd8e
Simplify OIDC authorization controller
monfresh Jun 20, 2017
68e307a
Merge pull request #1494 from 18F/margolis-openid-params-bugs
zachmargolis Jun 21, 2017
9b2cd0a
Remove unused file
monfresh Jun 22, 2017
f0df402
Merge pull request #1497 from 18F/mb-improve-test-coverage
monfresh Jun 22, 2017
06f9789
Add reactivation warning modal, fallback, specs
el-mapache Jun 12, 2017
f219b7e
Make verify-by-mail codes less error-prone
zachmargolis Jun 22, 2017
461af5f
Update aws-sdk-core from 2.9.20 to 2.10.1
monfresh Jun 22, 2017
ad6d318
Update brakeman from 3.6.1 to 3.6.2
monfresh Jun 22, 2017
fd358c0
Update httparty from 0.15.4 to 0.15.5
monfresh Jun 22, 2017
bb420d7
Update json-jwt from 1.7.1 to 1.7.2
monfresh Jun 22, 2017
9813e98
Update newrelic_rpm from 4.1.0.333 to 4.2.0.334
monfresh Jun 22, 2017
5ac26e9
Update pg from 0.20.0 to 0.21.0
monfresh Jun 22, 2017
5834c0f
Update phony_rails from 0.14.5 to 0.14.6
monfresh Jun 22, 2017
c261a2d
Update rack-mini-profiler from 0.10.4 to 0.10.5
monfresh Jun 22, 2017
a2cf71c
Update rails-erd from 1.5.0 to 1.5.2
monfresh Jun 22, 2017
312de86
Update reek from 4.6.2 to 4.7.1
monfresh Jun 22, 2017
957bb4d
Update rubocop from 0.48.1 to 0.49.1
monfresh Jun 22, 2017
b29eade
Update ruby-saml from 1.4.2 to 1.4.3
monfresh Jun 22, 2017
add9533
Update secure_headers from 3.6.4 to 3.6.5
monfresh Jun 22, 2017
d1202a0
Update sidekiq from 4.2.10 to 5.0.3
monfresh Jun 22, 2017
c2e15b8
Update slim_lint from 0.12.0 to 0.13.0
monfresh Jun 22, 2017
7735fef
Update timecop from 0.8.1 to 0.9.0
monfresh Jun 22, 2017
39a6bd2
Update xmlenc from 0.6.8 to 0.6.9
monfresh Jun 22, 2017
63b05ea
Merge pull request #1487 from 18F/ab-account-reactivate-modal
el-mapache Jun 22, 2017
652bd0e
Fix linter offenses
monfresh Jun 22, 2017
dfce049
Remove unused Marshal code
monfresh Jun 22, 2017
75fc112
Remove unused rake task
monfresh Jun 22, 2017
4a2a54d
Merge pull request #1502 from 18F/mb-remove-unused-rake-task
monfresh Jun 23, 2017
3eb523b
Merge pull request #1501 from 18F/mb-removed-unused-code
monfresh Jun 23, 2017
5fcdba3
Merge pull request #1500 from 18F/mb-update-gems
monfresh Jun 23, 2017
ec10647
Merge pull request #1498 from 18F/margolis-case-insensitive-verify-by…
zachmargolis Jun 23, 2017
22c981d
Use HTTP header for i18n
hursey013 Jun 14, 2017
c7134d9
Added new logo for cbp trusted traveler program
Jun 26, 2017
d2866f3
Merge pull request #1488 from 18F/bh-header-i18n
hursey013 Jun 26, 2017
208c965
Merge pull request #1503 from 18F/update_cbpttp_logo
nickbristow Jun 26, 2017
bbb6eed
Revert "Added new logo for cbp trusted traveler program"
nickbristow Jun 26, 2017
77b1d1c
Merge pull request #1504 from 18F/revert-1503-update_cbpttp_logo
nickbristow Jun 26, 2017
e30d157
Lock users out temporarily after too many OTPs
zachmargolis May 25, 2017
af3f5c7
Track OTPs per phone number, use consistent lockout
monfresh Jun 19, 2017
b8f61a9
Merge pull request #1464 from 18F/margolis-otp-lockout
zachmargolis Jun 26, 2017
fe9f1ce
Remove OtpRequestsTracker#encrypted_phone
zachmargolis Jun 26, 2017
c180d44
Merge pull request #1505 from 18F/margolis-remove-similar-code
monfresh Jun 26, 2017
a626410
Use AccountReactivationSession object
el-mapache Jun 21, 2017
fc9eb66
Merge pull request #1496 from 18F/ab-reactivate-session
el-mapache Jun 27, 2017
286c172
Set a default value for lockout period
monfresh Jun 27, 2017
5c2ea43
Merge pull request #1507 from 18F/mb-set-default-lockout-period
monfresh Jun 27, 2017
77f8b0b
Return to branded page when canceling sign in
monfresh Jul 5, 2017
db022fd
Allow multiple account creation in same session
monfresh Jul 13, 2017
bd6673d
Respond with 404 for all nonexistent assets
monfresh Jul 13, 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 .reek
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ DuplicateMethodCall:
- needs_to_confirm_email_change?
- WorkerHealthChecker#status
- FileEncryptor#encrypt
- UserFlowExporter#self.massage_assets
FeatureEnvy:
exclude:
- track_registration
Expand All @@ -22,6 +23,7 @@ FeatureEnvy:
- UserDecorator#should_acknowledge_personal_key?
- Pii::Attributes#[]=
- OpenidConnectLogoutForm#load_identity
- Idv::ProfileMaker#pii_from_applicant
InstanceVariableAssumption:
exclude:
- User
Expand All @@ -33,6 +35,7 @@ ManualDispatch:
NestedIterators:
exclude:
- FileEncryptor#encrypt
- UserFlowExporter#self.massage_html
NilCheck:
enabled: false
LongParameterList:
Expand All @@ -58,6 +61,9 @@ TooManyStatements:
- SamlIdpAuthConcern#store_saml_request
- Users::PhoneConfirmationController
- FileEncryptor#encrypt
- UserFlowExporter#self.massage_assets
- UserFlowExporter#self.massage_html
- UserFlowExporter#self.run
TooManyMethods:
exclude:
- Users::ConfirmationsController
Expand Down
12 changes: 7 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ AllCops:
Include:
- '**/Gemfile'
- '**/Rakefile'
- '**/Capfile'
Exclude:
- 'db/schema.rb'
- 'bin/**/*'
Expand All @@ -17,6 +18,7 @@ AllCops:
- 'lib/rspec/user_flow_formatter.rb'
- 'lib/user_flow_exporter.rb'
TargetRubyVersion: 2.3
TargetRailsVersion: 4.0
UseCache: true

Rails:
Expand Down Expand Up @@ -119,7 +121,7 @@ Rails/TimeZone:
- strict
- flexible

Style/AlignParameters:
Layout/AlignParameters:
# Alignment of parameters in multi-line method calls.
#
# The `with_first_parameter` style aligns the following lines along the same
Expand Down Expand Up @@ -160,7 +162,7 @@ Style/Documentation:
- 'spec/**/*'
- 'test/**/*'

Style/DotPosition:
Layout/DotPosition:
Description: Checks the position of the dot in multi-line method calls.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
EnforcedStyle: trailing
Expand All @@ -179,7 +181,7 @@ Style/EmptyElse:
- nil
- both

Style/ExtraSpacing:
Layout/ExtraSpacing:
# When true, allows most uses of extra spacing if the intent is to align
# things with the previous or next line, not counting empty lines or comment
# lines.
Expand All @@ -200,7 +202,7 @@ Style/IfUnlessModifier:
MaxLineLength: 80

# Checks the indentation of the first element in an array literal.
Style/IndentArray:
Layout/IndentArray:
# The value `special_inside_parentheses` means that array literals with
# brackets that have their opening bracket on the same line as a surrounding
# opening round parenthesis, shall have their first element indented relative
Expand All @@ -221,7 +223,7 @@ Style/IndentArray:
# But it can be overridden by setting this parameter
IndentationWidth: ~

Style/MultilineOperationIndentation:
Layout/MultilineOperationIndentation:
EnforcedStyle: aligned
SupportedStyles:
- aligned
Expand Down
34 changes: 2 additions & 32 deletions .slim-lint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
exclude:
- 'app/views/shared/_flashes.html.slim'
linters:
LineLength:
max: 100
Expand All @@ -6,35 +8,3 @@ linters:
- 'app/views/pages/privacy_policy.html.slim'
RuboCop:
enabled: true
# slim-lint ignores all of these cops by default, and we need to copy them
# all over if we want to add more cops to the list. We had to do this to
# ignore the Metrics/BlockLength cop, which will hopefully be ignored by
# default if this issue is addressed: https://github.com/sds/slim-lint/issues/49
# If it gets added to the default list of ignored cops, we can remove this
# whole RuboCop section.
ignored_cops:
- Lint/BlockAlignment
- Lint/EndAlignment
- Lint/Void
- Metrics/BlockLength
- Metrics/LineLength
- Style/AlignHash
- Style/AlignParameters
- Style/BlockNesting
- Style/FileName
- Style/FirstParameterIndentation
- Style/FrozenStringLiteralComment
- Style/IfUnlessModifier
- Style/IndentationConsistency
- Style/IndentationWidth
- Style/MultilineArrayBraceLayout
- Style/MultilineAssignmentLayout
- Style/MultilineHashBraceLayout
- Style/MultilineMethodCallBraceLayout
- Style/MultilineMethodDefinitionBraceLayout
- Style/MultilineMethodCallIndentation
- Style/MultilineOperationIndentation
- Style/Next
- Style/TrailingBlankLines
- Style/TrailingWhitespace
- Style/WhileUntilModifier
2 changes: 1 addition & 1 deletion Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require 'new_relic/recipes'
require 'whenever/capistrano'

# support for git
require "capistrano/scm/git"
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git

# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ gem 'gibberish'
gem 'gyoku'
gem 'hashie'
gem 'hiredis'
gem 'http_accept_language'
gem 'httparty'
gem 'json-jwt'
gem 'lograge'
Expand Down
68 changes: 36 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git@github.com:18F/identity-equifax-api-client-gem.git
revision: 979a3342a2d08ee6ea2c444b846e4e15d50a0891
revision: 4308a502baf7b65e8b463ecafc2d428d530b4349
branch: master
specs:
equifax (1.0.0)
Expand Down Expand Up @@ -117,7 +117,7 @@ GEM
american_date (1.1.1)
arel (6.0.4)
ast (2.3.0)
aws-sdk-core (2.9.20)
aws-sdk-core (2.10.1)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sigv4 (1.0.0)
Expand All @@ -135,10 +135,10 @@ GEM
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindata (2.3.5)
bindata (2.4.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (3.6.1)
brakeman (3.6.2)
browser (2.4.0)
browserify-rails (4.2.0)
addressable (>= 2.4.0)
Expand Down Expand Up @@ -228,7 +228,7 @@ GEM
rails (>= 3.1.1)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.0)
dotenv (2.2.1)
dotiw (3.1.1)
actionpack (>= 3)
i18n
Expand Down Expand Up @@ -293,12 +293,13 @@ GEM
highline (1.7.8)
hiredis (0.6.1)
htmlentities (4.3.4)
http_accept_language (2.1.0)
httparty (0.15.4)
multi_xml (>= 0.5.2)
httpi (2.4.2)
rack
socksify
i18n (0.8.1)
i18n (0.8.4)
i18n-tasks (0.9.15)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
Expand All @@ -313,7 +314,7 @@ GEM
iniparse (1.4.2)
jmespath (1.3.1)
json (2.1.0)
json-jwt (1.7.1)
json-jwt (1.7.2)
activesupport
bindata
multi_json (>= 1.3)
Expand Down Expand Up @@ -351,17 +352,17 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
mini_portile2 (2.2.0)
minitest (5.10.2)
multi_json (1.12.1)
multi_xml (0.6.0)
nenv (0.3.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
newrelic_rpm (4.1.0.333)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
newrelic_rpm (4.2.0.334)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nori (2.6.0)
notiffany (0.1.1)
nenv (~> 0.1)
Expand All @@ -370,13 +371,14 @@ GEM
overcommit (0.39.1)
childprocess (~> 0.6.3)
iniparse (~> 1.4)
parallel (1.11.2)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.20.0)
phony (2.15.42)
phony_rails (0.14.5)
pg (0.21.0)
phony (2.15.44)
phony_rails (0.14.6)
activesupport (>= 3.0)
phony (~> 2.15)
phony (> 2.15)
poltergeist (1.15.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
Expand All @@ -403,7 +405,7 @@ GEM
rack-attack (5.0.1)
rack
rack-cors (0.4.1)
rack-mini-profiler (0.10.4)
rack-mini-profiler (0.10.5)
rack (>= 1.2.0)
rack-protection (1.5.3)
rack
Expand All @@ -429,7 +431,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.5.0)
rails-erd (1.5.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
Expand All @@ -453,7 +455,7 @@ GEM
connection_pool (~> 2.1)
redis (~> 3.0)
redis (3.3.3)
reek (4.6.2)
reek (4.7.1)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.4.0.0, < 2.5)
rainbow (~> 2.0)
Expand Down Expand Up @@ -486,15 +488,16 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (0.48.1)
rubocop (0.49.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-graphviz (1.2.3)
ruby-progressbar (1.8.1)
ruby-saml (1.4.2)
ruby-saml (1.4.3)
nokogiri (>= 1.5.10)
ruby_dep (1.5.0)
ruby_parser (3.8.4)
Expand All @@ -519,18 +522,18 @@ GEM
wasabi (~> 3.4)
scrypt (3.0.5)
ffi-compiler (>= 1.0, < 2.0)
secure_headers (3.6.4)
secure_headers (3.6.5)
useragent
securecompare (1.0.0)
sexp_processor (4.8.0)
shellany (0.0.1)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
sidekiq (4.2.10)
sidekiq (5.0.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
redis (~> 3.3, >= 3.3.3)
simple_form (3.5.0)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
Expand All @@ -546,16 +549,16 @@ GEM
skinny (0.2.4)
eventmachine (~> 1.0.0)
thin (>= 1.5, < 1.7)
slim (3.0.7)
temple (~> 0.7.6)
slim (3.0.8)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.2)
actionpack (>= 3.1)
railties (>= 3.1)
slim (~> 3.0)
slim_lint (0.12.0)
slim_lint (0.13.0)
rake (>= 10, < 13)
rubocop (>= 0.48.0)
rubocop (>= 0.49.0)
slim (~> 3.0)
sysexits (~> 1.1)
slop (3.6.0)
Expand All @@ -578,7 +581,7 @@ GEM
railties (>= 3.2.5, < 6)
teaspoon-mocha (2.3.3)
teaspoon (>= 1.0.0)
temple (0.7.7)
temple (0.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test_after_commit (1.1.0)
Expand All @@ -591,7 +594,7 @@ GEM
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.8.1)
timecop (0.9.0)
twilio-ruby (4.13.0)
builder (>= 2.1.2)
jwt (~> 1.0)
Expand All @@ -600,7 +603,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.2.1)
unicode-display_width (1.3.0)
uniform_notifier (1.10.0)
url_safe_base64 (0.2.2)
user_agent_parser (2.3.1)
Expand Down Expand Up @@ -631,7 +634,7 @@ GEM
whenever (0.9.7)
chronic (>= 0.6.3)
xml-simple (1.1.5)
xmlenc (0.6.8)
xmlenc (0.6.9)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
nokogiri (>= 1.6.0, < 2.0.0)
Expand Down Expand Up @@ -685,6 +688,7 @@ DEPENDENCIES
gyoku
hashie
hiredis
http_accept_language
httparty
i18n-tasks
json-jwt
Expand Down Expand Up @@ -746,4 +750,4 @@ RUBY VERSION
ruby 2.3.3p222

BUNDLED WITH
1.14.6
1.15.1
1 change: 1 addition & 0 deletions app/assets/images/alert/notice.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading