Merge branch 'master' into staging

CruGlobal · Apr 6, 2020 · a03cc74 · a03cc74
2 parents 355885c + d39f3e3
commit a03cc74
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 349 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.4
+2.6.5
diff --git a/.travis.yml b/.travis.yml
@@ -11,5 +11,5 @@ before_script:
 script:
 - bundle exec rspec spec
 - bundle exec standardrb
-- bundle exec bundle audit check
+- bundle exec bundle audit check --update
 - bundle exec brakeman --ensure-latest -A -q --no-pager
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "2.6.4"
+ruby "2.6.5"
 
 gem "rails", "~> 5.2.3"
 gem "puma", "~> 3.11"
@@ -10,7 +10,6 @@ gem "bootsnap", ">= 1.1.0", require: false
 
 gem "active_model_serializers", git: "https://github.com/rails-api/active_model_serializers.git"
 gem "newrelic_rpm"
-gem "rails-api-newrelic"
 gem "versionist"
 gem "rack-cors", require: "rack/cors"
 gem "rollbar"
@@ -28,6 +27,7 @@ gem "assignable_values"
 gem "global_registry"
 gem "ddtrace"
 gem "dogstatsd-ruby"
+gem "awesome_print"
 
 group :development, :test do
   gem "brakeman"
@@ -42,7 +42,6 @@ group :development, :test do
   gem "pry-rails"
   gem "pry-byebug"
   gem "http_logger"
-  gem "awesome_print"
 end
 
 group :development do