Merge branch 'master' into dependabot/bundler/pg-1.2.3

This commit is contained in:
Andrew Brown 2020-03-25 14:00:18 -05:00 committed by GitHub
commit 312cd390aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View File

@ -129,7 +129,7 @@ group :test do
gem 'rspec-rails'
gem 'webmock'
gem 'rubocop', require: false
gem 'ruby-prof', '1.3.0'
gem 'ruby-prof', '1.3.1'
gem 'shoulda-matchers', '~> 4.3'
gem 'rails-controller-testing'
end

View File

@ -116,7 +116,7 @@ GEM
autoprefixer-rails (9.7.4)
execjs
aws-eventstream (1.0.3)
aws-partitions (1.271.0)
aws-partitions (1.283.0)
aws-sdk (3.0.1)
aws-sdk-resources (~> 3)
aws-sdk-accessanalyzer (1.1.0)
@ -275,7 +275,7 @@ GEM
aws-sdk-connectparticipant (1.0.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.89.1)
aws-sdk-core (3.91.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@ -484,7 +484,7 @@ GEM
aws-sdk-kinesisvideosignalingchannels (1.0.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.28.0)
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-lakeformation (1.1.0)
@ -875,7 +875,7 @@ GEM
aws-sdk-route53resolver (1.11.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.60.2)
aws-sdk-s3 (1.61.1)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -1003,7 +1003,7 @@ GEM
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sigv2 (1.0.1)
aws-sigv4 (1.1.0)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
babel-source (5.8.35)
babel-transpiler (0.7.0)
@ -1146,7 +1146,7 @@ GEM
haml (5.1.2)
temple (>= 0.8.0)
tilt
hashdiff (1.0.0)
hashdiff (1.0.1)
html-pipeline (2.12.3)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -1288,7 +1288,7 @@ GEM
pundit (2.1.0)
activesupport (>= 3.0.0)
rack (2.2.2)
rack-mini-profiler (1.1.6)
rack-mini-profiler (2.0.1)
rack (>= 1.2.0)
rack-pjax (1.1.0)
nokogiri (~> 1.5)
@ -1331,7 +1331,7 @@ GEM
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_admin (2.0.1)
rails_admin (2.0.2)
activemodel-serializers-xml (>= 1.0)
builder (~> 3.1)
haml (>= 4.0, < 6)
@ -1405,7 +1405,7 @@ GEM
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-prof (1.3.0)
ruby-prof (1.3.1)
ruby-progressbar (1.10.1)
ruby-vips (2.0.17)
ffi (~> 1.9)
@ -1486,7 +1486,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webmock (3.8.2)
webmock (3.8.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -1571,7 +1571,7 @@ DEPENDENCIES
rspec-prof
rspec-rails
rubocop
ruby-prof (= 1.3.0)
ruby-prof (= 1.3.1)
sass-rails
selenium-webdriver
serendipitous!