Skip to content

Commit 2eb8654

Browse files
committed
Bump Ruby 2.6.0
1 parent 90ddbad commit 2eb8654

File tree

8 files changed

+28
-29
lines changed

8 files changed

+28
-29
lines changed

.ruby-version

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

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.3
1+
FROM ruby:2.6.0
22

33
ENV LANG=C.UTF-8
44

Dockerfile-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.3-alpine
1+
FROM ruby:2.6.0-alpine
22

33
ENV LANG=C.UTF-8
44

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.5.3'
2+
ruby '2.6.0'
33

44
gem 'rake'
55
gem 'thor'

Gemfile.lock

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,41 @@ GEM
1919
coffee-script-source (1.12.2)
2020
concurrent-ruby (1.1.4)
2121
daemons (1.3.1)
22-
erubi (1.7.1)
23-
ethon (0.11.0)
22+
erubi (1.8.0)
23+
ethon (0.12.0)
2424
ffi (>= 1.3.0)
2525
eventmachine (1.2.7)
2626
execjs (2.7.0)
2727
exifr (1.3.5)
28-
ffi (1.9.25)
28+
ffi (1.10.0)
2929
fspath (3.1.0)
3030
highline (2.0.0)
31-
html-pipeline (2.9.1)
31+
html-pipeline (2.10.0)
3232
activesupport (>= 2)
3333
nokogiri (>= 1.4)
34-
i18n (1.2.0)
34+
i18n (1.5.2)
3535
concurrent-ruby (~> 1.0)
3636
image_optim (0.26.3)
3737
exifr (~> 1.2, >= 1.2.2)
3838
fspath (~> 3.0)
3939
image_size (>= 1.5, < 3)
4040
in_threads (~> 1.3)
4141
progress (~> 3.0, >= 3.0.1)
42-
image_optim_pack (0.5.1.20181213)
42+
image_optim_pack (0.5.1.20190105)
4343
fspath (>= 2.1, < 4)
4444
image_optim (~> 0.19)
4545
image_size (2.0.0)
46-
in_threads (1.5.0)
46+
in_threads (1.5.1)
4747
method_source (0.9.2)
4848
mini_portile2 (2.4.0)
4949
minitest (5.11.3)
5050
multi_json (1.13.1)
5151
mustermann (1.0.3)
52-
net-sftp (2.1.3.rc3)
53-
net-ssh (>= 2.6.5, < 6.0.0)
54-
net-ssh (5.0.2)
55-
newrelic_rpm (5.6.0.349)
56-
nokogiri (1.9.0)
52+
net-sftp (3.0.0.beta1)
53+
net-ssh (>= 5.0.0, < 6.0.0)
54+
net-ssh (5.1.0)
55+
newrelic_rpm (5.7.0.350)
56+
nokogiri (1.10.1)
5757
mini_portile2 (~> 2.4.0)
5858
options (2.3.2)
5959
progress (3.5.0)
@@ -64,7 +64,7 @@ GEM
6464
coderay (~> 1.1.0)
6565
method_source (~> 0.9.0)
6666
rack (2.0.6)
67-
rack-protection (2.0.4)
67+
rack-protection (2.0.5)
6868
rack
6969
rack-ssl-enforcer (0.2.9)
7070
rack-test (1.1.0)
@@ -74,23 +74,22 @@ GEM
7474
rb-inotify (0.10.0)
7575
ffi (~> 1.0)
7676
rr (1.2.1)
77-
sass (3.7.2)
77+
sass (3.7.3)
7878
sass-listen (~> 4.0.0)
7979
sass-listen (4.0.0)
8080
rb-fsevent (~> 0.9, >= 0.9.4)
8181
rb-inotify (~> 0.9, >= 0.9.7)
82-
sinatra (2.0.4)
82+
sinatra (2.0.5)
8383
mustermann (~> 1.0)
8484
rack (~> 2.0)
85-
rack-protection (= 2.0.4)
85+
rack-protection (= 2.0.5)
8686
tilt (~> 2.0)
87-
sinatra-contrib (2.0.4)
88-
activesupport (>= 4.0.0)
87+
sinatra-contrib (2.0.5)
8988
backports (>= 2.8.2)
9089
multi_json
9190
mustermann (~> 1.0)
92-
rack-protection (= 2.0.4)
93-
sinatra (= 2.0.4)
91+
rack-protection (= 2.0.5)
92+
sinatra (= 2.0.5)
9493
tilt (>= 1.3, < 3)
9594
sprockets (3.7.2)
9695
concurrent-ruby (~> 1.0)
@@ -121,7 +120,7 @@ GEM
121120
thread_safe (~> 0.1)
122121
uglifier (4.1.20)
123122
execjs (>= 0.3.0, < 3)
124-
unicode-display_width (1.4.0)
123+
unicode-display_width (1.4.1)
125124
unicode_utils (1.4.0)
126125
unix_utils (0.0.15)
127126
yajl-ruby (1.4.1)
@@ -163,7 +162,7 @@ DEPENDENCIES
163162
yajl-ruby
164163

165164
RUBY VERSION
166-
ruby 2.5.3p105
165+
ruby 2.6.0p0
167166

168167
BUNDLED WITH
169168
1.17.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Unless you wish to contribute to the project, we recommend using the hosted vers
1818

1919
DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app.
2020

21-
DevDocs requires Ruby 2.5.3, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands:
21+
DevDocs requires Ruby 2.6.0, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands:
2222

2323
```
2424
git clone https://github.com/freeCodeCamp/devdocs.git && cd devdocs

lib/docs/core/requester.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def self.run(urls, options = {}, &block)
2222
def initialize(options = {})
2323
@request_options = options.extract!(:request_options)[:request_options].try(:dup) || {}
2424
options[:max_concurrency] ||= 20
25-
options[:pipelining] = false
25+
options[:pipelining] = 0
2626
super
2727
end
2828

lib/docs/core/url.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def subpath_to(url, options = nil)
7272

7373
if base == dest
7474
''
75-
elsif dest.start_with? File.join(base, '')
75+
elsif dest.start_with?(::File.join(base, ''))
7676
url.path[(path.length)..-1]
7777
end
7878
end

0 commit comments

Comments
 (0)