Merge pull request #844 from datacite/rails6

Rails 6

Gemfile

@@ -11,22 +11,20 @@ gem "aws-sdk-sqs", "~> 1.3"
 gem "base32-url", "~> 0.3"
 gem "batch-loader", "~> 1.4", ">= 1.4.1"
 gem "bcrypt", "~> 3.1.7"
-gem "bergamasco", "~> 0.3.10"
 gem "bolognese", "~> 1.9"
 gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
-gem "cancancan", "~> 2.0"
+gem "cancancan", "~> 3.0"
 gem "commonmarker", "~> 0.23.4"
 gem "countries", "~> 2.1", ">= 2.1.2"
 gem "country_select", "~> 3.1"
 gem "crawler_detect"
 gem "dalli", "~> 2.7", ">= 2.7.6"
 gem "ddtrace", "~> 0.32.0"
-gem "departure", "~> 6.2"
 gem "diffy", "~> 3.2", ">= 3.2.1"
 gem "dotenv"
 gem "elasticsearch", "7.5"
-gem "elasticsearch-model", "~> 7.1", ">= 7.1.1", require: "elasticsearch/model"
-gem "elasticsearch-rails", "~> 7.1", ">= 7.1.1"
+gem "elasticsearch-model", "~> 7.1.1", ">= 7.1.1", require: "elasticsearch/model"
+gem "elasticsearch-rails", "~> 7.1.1", ">= 7.1.1"
 gem "elasticsearch-transport", "7.5"
 gem "equivalent-xml", "~> 0.6.0"
 gem "facets", require: false
@@ -42,6 +40,7 @@ gem "graphql", "1.11.4"
 gem "graphql-batch", "~> 0.4.1"
 gem "graphql-cache", "~> 0.6.0"
 gem "graphql-errors", "~> 0.4.0"
+gem "hashid-rails", "~> 1.4"
 gem "iso-639", "~> 0.3.5"
 gem "iso8601", "~> 0.9.0"
 gem "jsonlint", "~> 0.3.0"
@@ -62,7 +61,7 @@ gem "premailer", "~> 1.11", ">= 1.11.1"
 gem "pwqgen.rb", "~> 0.1.0"
 gem "rack-cors", "~> 1.0", require: "rack/cors"
 gem "rack-utf8_sanitizer", "~> 1.6"
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 6.1.6"
 gem "rake", "~> 12.0"
 gem "sentry-raven", "~> 2.9"
 gem "shoryuken", "~> 4.0"
@@ -113,5 +112,3 @@ group :test do
   gem "vcr", "~> 5.1"
   gem "webmock", "~> 3.1"
 end
-
-gem "hashid-rails", "~> 1.4"