Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/rubocop-tw-0.74.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dillonwelch committed Aug 20, 2019
2 parents a8ec8a9 + 44c731f commit b798c56
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ GEM
tins (~> 1.6)
crass (1.0.4)
database_cleaner (1.7.0)
devise (4.6.2)
devise (4.7.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails_email_validator (0.1.4)
activemodel (>= 3.0.0)
Expand All @@ -162,10 +162,10 @@ GEM
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rake (12.3.3)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rmagick (4.0.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
Expand Down Expand Up @@ -218,7 +218,7 @@ GEM
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
wwtd (1.3.0)
wwtd (1.4.0)
yard (0.9.20)

PLATFORMS
Expand Down

0 comments on commit b798c56

Please sign in to comment.