Skip to content
This repository was archived by the owner on Nov 28, 2024. It is now read-only.

Commit 1bcddb5

Browse files
authored
Merge pull request #679 from Data-Liberation-Front/ruby2.5
Upgrade to Ruby 2.5
2 parents e88bbc6 + 00dcbc1 commit 1bcddb5

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: ruby/setup-ruby@v1
1616
with:
1717
bundler-cache: true
18-
ruby-version: 2.4
18+
ruby-version: 2.5
1919
- name: Start MongoDB
2020
uses: supercharge/[email protected]
2121
with:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.10
1+
2.5.9

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '~> 2.4'
2+
ruby '~> 2.5'
33

44
gem 'rake', '~> 13.0'
55
gem 'rails', '~> 4.2'
@@ -81,7 +81,7 @@ gem 'bootstrap-kaminari-views', '~> 0.0'
8181
gem 'data_kitten', git: 'https://github.com/Data-Liberation-Front/data_kitten.git', ref: "e343510bd15e3329c1f2fab35035e248195348be", require: false
8282
gem 'rubyzip', '~> 2.3'
8383

84-
gem 'csvlint', '~> 0.4'
84+
gem 'csvlint', '~> 1.0'
8585
gem 'datapackage', '0.0.4' # temporarily pinned to avoid breaking the build
8686
gem 'rest-client', '~> 2.0'
8787

Gemfile.lock

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ GEM
126126
execjs
127127
coffee-script-source (1.12.2)
128128
colorize (0.8.1)
129-
concurrent-ruby (1.1.8)
129+
concurrent-ruby (1.1.10)
130130
connection_pool (2.2.1)
131131
coveralls (0.8.23)
132132
json (>= 1.8, < 3)
@@ -137,15 +137,14 @@ GEM
137137
crack (0.4.5)
138138
rexml
139139
crass (1.0.6)
140-
csvlint (0.4.0)
140+
csvlint (1.0.0)
141141
activesupport
142142
addressable
143-
colorize
144143
escape_utils
145-
mime-types
146-
net-http-persistent (< 3.0)
144+
net-http-persistent
147145
open_uri_redirections
148146
rack
147+
rainbow
149148
thor
150149
typhoeus
151150
uri_template
@@ -196,9 +195,9 @@ GEM
196195
equivalent-xml (0.6.0)
197196
nokogiri (>= 1.4.3)
198197
erubis (2.7.0)
199-
escape_utils (1.2.1)
200-
ethon (0.12.0)
201-
ffi (>= 1.3.0)
198+
escape_utils (1.3.0)
199+
ethon (0.15.0)
200+
ffi (>= 1.15.0)
202201
eventmachine (1.2.7)
203202
excon (0.92.3)
204203
execjs (2.7.0)
@@ -209,7 +208,7 @@ GEM
209208
railties (>= 4.2.0)
210209
faker (2.2.1)
211210
i18n (>= 0.8)
212-
ffi (1.12.2)
211+
ffi (1.15.5)
213212
fission (0.5.0)
214213
CFPropertyList (~> 2.2)
215214
fog (1.41.0)
@@ -482,10 +481,12 @@ GEM
482481
mail (2.7.1)
483482
mini_mime (>= 0.1.1)
484483
method_source (1.0.0)
485-
mime-types (2.99.3)
484+
mime-types (3.4.1)
485+
mime-types-data (~> 3.2015)
486+
mime-types-data (3.2022.0105)
486487
mini_mime (1.0.2)
487488
mini_portile2 (2.4.0)
488-
minitest (5.14.3)
489+
minitest (5.15.0)
489490
mongoid (5.1.6)
490491
activemodel (~> 4.0)
491492
mongo (~> 2.1)
@@ -494,7 +495,8 @@ GEM
494495
multi_json (1.15.0)
495496
multi_test (0.1.2)
496497
nenv (0.3.0)
497-
net-http-persistent (2.9.4)
498+
net-http-persistent (3.1.0)
499+
connection_pool (~> 2.2)
498500
netrc (0.11.0)
499501
nio4r (2.5.7)
500502
nokogiri (1.10.10)
@@ -562,6 +564,7 @@ GEM
562564
activesupport (= 4.2.11.3)
563565
rake (>= 0.8.7)
564566
thor (>= 0.18.1, < 2.0)
567+
rainbow (3.1.1)
565568
rake (13.0.3)
566569
rb-fsevent (0.10.4)
567570
rb-inotify (0.10.1)
@@ -723,7 +726,7 @@ GEM
723726
daemons (~> 1.0, >= 1.0.9)
724727
eventmachine (~> 1.0, >= 1.0.4)
725728
rack (>= 1, < 3)
726-
thor (1.1.0)
729+
thor (1.2.1)
727730
thread_safe (0.3.6)
728731
tilt (2.0.10)
729732
timecop (0.9.4)
@@ -733,8 +736,8 @@ GEM
733736
turbolinks (5.2.1)
734737
turbolinks-source (~> 5.2)
735738
turbolinks-source (5.2.0)
736-
typhoeus (0.8.0)
737-
ethon (>= 0.8.0)
739+
typhoeus (1.4.0)
740+
ethon (>= 0.9.0)
738741
tzinfo (1.2.9)
739742
thread_safe (~> 0.1)
740743
uglifier (4.2.0)
@@ -774,7 +777,7 @@ DEPENDENCIES
774777
cloudflare (~> 2.1)
775778
coffee-rails (~> 4.2)
776779
coveralls (~> 0.8)
777-
csvlint (~> 0.4)
780+
csvlint (~> 1.0)
778781
cucumber-api-steps!
779782
cucumber-rails (~> 1.4)
780783
data_kitten!
@@ -827,7 +830,7 @@ DEPENDENCIES
827830
webmock (~> 3.12)
828831

829832
RUBY VERSION
830-
ruby 2.4.10p364
833+
ruby 2.5.9p229
831834

832835
BUNDLED WITH
833836
1.17.3

0 commit comments

Comments
 (0)