Skip to content

Commit 82f853a

Browse files
Merge pull request #157 from datacite/upgrade_volpino
Upgrade volpino rails 6
2 parents f829782 + ea8a6c1 commit 82f853a

18 files changed

+335
-160
lines changed

Gemfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
6-
gem "mysql2", "~> 0.4.4"
7-
gem "rails", "~> 5.2.0"
6+
gem "mysql2", "~> 0.5.0"
7+
gem "rails", "~> 6.0"
88

99
gem "aasm", "~> 5.0", ">= 5.0.6"
1010
gem "active_model_serializers", "~> 0.10.10"
@@ -23,7 +23,7 @@ gem "flipper-ui"
2323
gem "nilify_blanks", "~> 1.3"
2424
gem "oj", ">= 2.8.3"
2525
gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
26-
gem "orcid_client", "~> 0.10.1"
26+
gem "orcid_client", "~> 0.11.0"
2727
gem "postrank-uri", "~> 1.0", ">= 1.0.24"
2828
gem "pwqgen.rb", "~> 0.1.0"
2929
gem "rake", "~> 12.0"
@@ -32,7 +32,6 @@ gem "shoryuken", "~> 5.0", ">= 5.0.3"
3232
gem "strip_attributes", "~> 1.9", ">= 1.9.2"
3333
gem "tzinfo-data", "~> 1.2019", ">= 1.2019.3"
3434

35-
gem "bergamasco", "~> 0.3.17"
3635
gem "commonmarker", "~> 0.21.0"
3736
gem "country_select", "~> 4.0"
3837
gem "dalli", "~> 2.7", ">= 2.7.10"
@@ -47,7 +46,7 @@ gem "rack-cors", "~> 1.0", require: "rack/cors"
4746
gem "rouge", "~> 3.15"
4847
gem "simple_form", "~> 4.1.0"
4948

50-
gem "cancancan", "~> 2.3"
49+
gem "cancancan", "~> 3.0"
5150
gem "devise", "~> 4.8"
5251
gem "gravtastic", "~> 3.2", ">= 3.2.6"
5352
gem "jwt", "~> 2.2", ">= 2.2.1"

0 commit comments

Comments
 (0)