Merge branch 'master' into dependabot/bundler/rspec-rails-3.8.2

This commit is contained in:
Andrew Brown 2019-05-30 15:59:12 -07:00 committed by GitHub
commit 75bf7828c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -258,7 +258,7 @@ GEM
railties (>= 3.2)
medium-editor-rails (2.3.1)
railties (>= 3.0)
memory_profiler (0.9.12)
memory_profiler (0.9.13)
meta-tags (2.11.0)
actionpack (>= 3.2.0, < 5.3)
method_source (0.9.2)
@ -322,7 +322,7 @@ GEM
pundit (2.0.1)
activesupport (>= 3.0.0)
rack (2.0.7)
rack-mini-profiler (1.0.1)
rack-mini-profiler (1.0.2)
rack (>= 1.2.0)
rack-pjax (1.0.0)
nokogiri (~> 1.5)