Skip to content

Commit d7ed7af

Browse files
authored
Merge pull request #988 from larouxn/upgrade_to_ruby_2.6.2
Upgrade Ruby and gems
2 parents 0a267cb + 5f8ced4 commit d7ed7af

File tree

4 files changed

+37
-36
lines changed

4 files changed

+37
-36
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.3

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ addons:
77

88
cache: bundler
99

10-
before_script:
10+
before_install:
11+
- "echo 'gem: --no-document' > ~/.gemrc"
1112
- gem update --system
1213
- gem install bundler
1314

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '2.6.0'
2+
ruby '2.6.3'
33

44
gem 'rake'
55
gem 'thor'

Gemfile.lock

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.2)
4+
activesupport (5.2.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
backports (3.11.4)
10-
better_errors (2.5.0)
9+
backports (3.15.0)
10+
better_errors (2.5.1)
1111
coderay (>= 1.0.0)
1212
erubi (>= 1.0.0)
1313
rack (>= 0.9.0)
14-
browser (2.5.3)
15-
chunky_png (1.3.10)
14+
browser (2.6.1)
15+
chunky_png (1.3.11)
1616
coderay (1.1.2)
1717
coffee-script (2.4.1)
1818
coffee-script-source
1919
execjs
2020
coffee-script-source (1.12.2)
21-
concurrent-ruby (1.1.4)
21+
concurrent-ruby (1.1.5)
2222
daemons (1.3.1)
2323
erubi (1.8.0)
2424
ethon (0.12.0)
2525
ffi (>= 1.3.0)
2626
eventmachine (1.2.7)
2727
execjs (2.7.0)
28-
exifr (1.3.5)
29-
ffi (1.10.0)
30-
fspath (3.1.0)
31-
highline (2.0.0)
32-
html-pipeline (2.10.0)
28+
exifr (1.3.6)
29+
ffi (1.11.1)
30+
fspath (3.1.2)
31+
highline (2.0.2)
32+
html-pipeline (2.11.1)
3333
activesupport (>= 2)
3434
nokogiri (>= 1.4)
35-
i18n (1.5.2)
35+
i18n (1.6.0)
3636
concurrent-ruby (~> 1.0)
37-
image_optim (0.26.3)
37+
image_optim (0.26.5)
3838
exifr (~> 1.2, >= 1.2.2)
3939
fspath (~> 3.0)
4040
image_size (>= 1.5, < 3)
4141
in_threads (~> 1.3)
4242
progress (~> 3.0, >= 3.0.1)
43-
image_optim_pack (0.5.1.20190105)
43+
image_optim_pack (0.5.6)
4444
fspath (>= 2.1, < 4)
4545
image_optim (~> 0.19)
46-
image_size (2.0.0)
47-
in_threads (1.5.1)
46+
image_size (2.0.2)
47+
in_threads (1.5.3)
4848
method_source (0.9.2)
4949
mini_portile2 (2.4.0)
5050
minitest (5.11.3)
5151
multi_json (1.13.1)
5252
mustermann (1.0.3)
5353
net-sftp (3.0.0.beta1)
5454
net-ssh (>= 5.0.0, < 6.0.0)
55-
net-ssh (5.1.0)
56-
newrelic_rpm (5.7.0.350)
57-
nokogiri (1.10.1)
55+
net-ssh (5.2.0)
56+
newrelic_rpm (6.5.0.357)
57+
nokogiri (1.10.3)
5858
mini_portile2 (~> 2.4.0)
5959
options (2.3.2)
60-
progress (3.5.0)
60+
progress (3.5.2)
6161
progress_bar (1.3.0)
6262
highline (>= 1.6, < 3)
6363
options (~> 2.3.0)
6464
pry (0.12.2)
6565
coderay (~> 1.1.0)
6666
method_source (~> 0.9.0)
67-
rack (2.0.6)
67+
rack (2.0.7)
6868
rack-protection (2.0.5)
6969
rack
7070
rack-ssl-enforcer (0.2.9)
@@ -75,7 +75,7 @@ GEM
7575
rb-inotify (0.10.0)
7676
ffi (~> 1.0)
7777
rr (1.2.1)
78-
sass (3.7.3)
78+
sass (3.7.4)
7979
sass-listen (~> 4.0.0)
8080
sass-listen (4.0.0)
8181
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -99,10 +99,10 @@ GEM
9999
sprockets (>= 2.2)
100100
sprockets-sass (2.0.0.beta2)
101101
sprockets (>= 2.0, < 4.0)
102-
strings (0.1.4)
103-
strings-ansi (~> 0.1.0)
104-
unicode-display_width (~> 1.4.0)
105-
unicode_utils (~> 1.4.0)
102+
strings (0.1.5)
103+
strings-ansi (~> 0.1)
104+
unicode-display_width (~> 1.5)
105+
unicode_utils (~> 1.4)
106106
strings-ansi (0.1.0)
107107
terminal-table (1.8.0)
108108
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -113,19 +113,19 @@ GEM
113113
thor (0.20.3)
114114
thread_safe (0.3.6)
115115
tilt (2.0.9)
116-
tty-pager (0.12.0)
116+
tty-pager (0.12.1)
117117
strings (~> 0.1.4)
118118
tty-screen (~> 0.6)
119119
tty-which (~> 0.4)
120-
tty-screen (0.6.5)
121-
tty-which (0.4.0)
120+
tty-screen (0.7.0)
121+
tty-which (0.4.1)
122122
typhoeus (1.3.1)
123123
ethon (>= 0.9.0)
124124
tzinfo (1.2.5)
125125
thread_safe (~> 0.1)
126126
uglifier (4.1.20)
127127
execjs (>= 0.3.0, < 3)
128-
unicode-display_width (1.4.1)
128+
unicode-display_width (1.6.0)
129129
unicode_utils (1.4.0)
130130
unix_utils (0.0.15)
131131
yajl-ruby (1.4.1)
@@ -159,8 +159,8 @@ DEPENDENCIES
159159
sinatra-contrib
160160
sprockets
161161
sprockets-helpers
162-
terminal-table
163162
sprockets-sass
163+
terminal-table
164164
thin
165165
thor
166166
tty-pager
@@ -170,7 +170,7 @@ DEPENDENCIES
170170
yajl-ruby
171171

172172
RUBY VERSION
173-
ruby 2.6.0p0
173+
ruby 2.6.3p62
174174

175175
BUNDLED WITH
176-
1.17.2
176+
2.0.2

0 commit comments

Comments
 (0)