Skip to content

Commit eebdd8a

Browse files
authored
Merge pull request #11 from patricklee2/master
update nokogiri and other gems
2 parents ada8e84 + 87b508c commit eebdd8a

File tree

4 files changed

+66
-69
lines changed

4 files changed

+66
-69
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
# Ignore bundler config.
1111
/.bundle
1212

13+
# ignore bundled gem files
14+
/vendor/bundle
15+
16+
1317
# Ignore the default SQLite database.
1418
/db/*.sqlite3
1519
/db/*.sqlite3-journal

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end
99
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
1010
gem 'rails', '~> 5.1.2'
1111
# Use sqlite3 as the database for Active Record
12-
gem 'sqlite3'
12+
gem 'sqlite3', '~> 1.3.13'
1313
# Use Puma as the app server
1414
gem 'puma', '~> 3.7'
1515
# Use SCSS for stylesheets

Gemfile.lock

Lines changed: 61 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6)
5-
actionpack (= 5.1.6)
4+
actioncable (5.1.6.1)
5+
actionpack (= 5.1.6.1)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6)
9-
actionpack (= 5.1.6)
10-
actionview (= 5.1.6)
11-
activejob (= 5.1.6)
8+
actionmailer (5.1.6.1)
9+
actionpack (= 5.1.6.1)
10+
actionview (= 5.1.6.1)
11+
activejob (= 5.1.6.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6)
15-
actionview (= 5.1.6)
16-
activesupport (= 5.1.6)
14+
actionpack (5.1.6.1)
15+
actionview (= 5.1.6.1)
16+
activesupport (= 5.1.6.1)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.6)
22-
activesupport (= 5.1.6)
21+
actionview (5.1.6.1)
22+
activesupport (= 5.1.6.1)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.6)
28-
activesupport (= 5.1.6)
27+
activejob (5.1.6.1)
28+
activesupport (= 5.1.6.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.6)
31-
activesupport (= 5.1.6)
32-
activerecord (5.1.6)
33-
activemodel (= 5.1.6)
34-
activesupport (= 5.1.6)
30+
activemodel (5.1.6.1)
31+
activesupport (= 5.1.6.1)
32+
activerecord (5.1.6.1)
33+
activemodel (= 5.1.6.1)
34+
activesupport (= 5.1.6.1)
3535
arel (~> 8.0)
36-
activesupport (5.1.6)
36+
activesupport (5.1.6.1)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
41-
addressable (2.5.2)
41+
addressable (2.6.0)
4242
public_suffix (>= 2.0.2, < 4.0)
4343
arel (8.0.0)
4444
bindex (0.5.0)
4545
builder (3.2.3)
46-
byebug (10.0.2)
46+
byebug (11.0.0)
4747
capybara (2.18.0)
4848
addressable
4949
mini_mime (>= 0.1.3)
@@ -60,68 +60,65 @@ GEM
6060
coffee-script-source
6161
execjs
6262
coffee-script-source (1.12.2)
63-
concurrent-ruby (1.0.5)
63+
concurrent-ruby (1.1.4)
6464
crass (1.0.4)
65-
erubi (1.7.1)
65+
erubi (1.8.0)
6666
execjs (2.7.0)
67-
ffi (1.9.25-x64-mingw32)
68-
ffi (1.9.25-x86-mingw32)
69-
globalid (0.4.1)
67+
ffi (1.10.0)
68+
globalid (0.4.2)
7069
activesupport (>= 4.2.0)
71-
i18n (1.1.0)
70+
i18n (1.5.3)
7271
concurrent-ruby (~> 1.0)
73-
jbuilder (2.7.0)
72+
jbuilder (2.8.0)
7473
activesupport (>= 4.2.0)
7574
multi_json (>= 1.2)
76-
loofah (2.2.2)
75+
loofah (2.2.3)
7776
crass (~> 1.0.2)
7877
nokogiri (>= 1.5.9)
79-
mail (2.7.0)
78+
mail (2.7.1)
8079
mini_mime (>= 0.1.1)
81-
method_source (0.9.0)
80+
method_source (0.9.2)
8281
mini_mime (1.0.1)
83-
mini_portile2 (2.3.0)
82+
mini_portile2 (2.4.0)
8483
minitest (5.11.3)
8584
multi_json (1.13.1)
8685
nio4r (2.3.1)
87-
nokogiri (1.8.4-x64-mingw32)
88-
mini_portile2 (~> 2.3.0)
89-
nokogiri (1.8.4-x86-mingw32)
90-
mini_portile2 (~> 2.3.0)
86+
nokogiri (1.10.1)
87+
mini_portile2 (~> 2.4.0)
9188
public_suffix (3.0.3)
9289
puma (3.12.0)
93-
rack (2.0.5)
90+
rack (2.0.6)
9491
rack-test (1.1.0)
9592
rack (>= 1.0, < 3)
96-
rails (5.1.6)
97-
actioncable (= 5.1.6)
98-
actionmailer (= 5.1.6)
99-
actionpack (= 5.1.6)
100-
actionview (= 5.1.6)
101-
activejob (= 5.1.6)
102-
activemodel (= 5.1.6)
103-
activerecord (= 5.1.6)
104-
activesupport (= 5.1.6)
93+
rails (5.1.6.1)
94+
actioncable (= 5.1.6.1)
95+
actionmailer (= 5.1.6.1)
96+
actionpack (= 5.1.6.1)
97+
actionview (= 5.1.6.1)
98+
activejob (= 5.1.6.1)
99+
activemodel (= 5.1.6.1)
100+
activerecord (= 5.1.6.1)
101+
activesupport (= 5.1.6.1)
105102
bundler (>= 1.3.0)
106-
railties (= 5.1.6)
103+
railties (= 5.1.6.1)
107104
sprockets-rails (>= 2.0.0)
108105
rails-dom-testing (2.0.3)
109106
activesupport (>= 4.2.0)
110107
nokogiri (>= 1.6)
111108
rails-html-sanitizer (1.0.4)
112109
loofah (~> 2.2, >= 2.2.2)
113-
railties (5.1.6)
114-
actionpack (= 5.1.6)
115-
activesupport (= 5.1.6)
110+
railties (5.1.6.1)
111+
actionpack (= 5.1.6.1)
112+
activesupport (= 5.1.6.1)
116113
method_source
117114
rake (>= 0.8.7)
118115
thor (>= 0.18.1, < 2.0)
119-
rake (12.3.1)
116+
rake (12.3.2)
120117
rb-fsevent (0.10.3)
121-
rb-inotify (0.9.10)
122-
ffi (>= 0.5.0, < 2)
118+
rb-inotify (0.10.0)
119+
ffi (~> 1.0)
123120
rubyzip (1.2.2)
124-
sass (3.5.7)
121+
sass (3.7.3)
125122
sass-listen (~> 4.0.0)
126123
sass-listen (4.0.0)
127124
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -132,29 +129,26 @@ GEM
132129
sprockets (>= 2.8, < 4.0)
133130
sprockets-rails (>= 2.0, < 4.0)
134131
tilt (>= 1.1, < 3)
135-
selenium-webdriver (3.14.0)
132+
selenium-webdriver (3.141.0)
136133
childprocess (~> 0.5)
137-
rubyzip (~> 1.2)
134+
rubyzip (~> 1.2, >= 1.2.2)
138135
sprockets (3.7.2)
139136
concurrent-ruby (~> 1.0)
140137
rack (> 1, < 3)
141138
sprockets-rails (3.2.1)
142139
actionpack (>= 4.0)
143140
activesupport (>= 4.0)
144141
sprockets (>= 3.0.0)
145-
sqlite3 (1.3.13-x64-mingw32)
146-
sqlite3 (1.3.13-x86-mingw32)
147-
thor (0.20.0)
142+
sqlite3 (1.3.13)
143+
thor (0.20.3)
148144
thread_safe (0.3.6)
149-
tilt (2.0.8)
145+
tilt (2.0.9)
150146
turbolinks (5.2.0)
151147
turbolinks-source (~> 5.2)
152148
turbolinks-source (5.2.0)
153149
tzinfo (1.2.5)
154150
thread_safe (~> 0.1)
155-
tzinfo-data (1.2018.5)
156-
tzinfo (>= 1.0.0)
157-
uglifier (4.1.19)
151+
uglifier (4.1.20)
158152
execjs (>= 0.3.0, < 3)
159153
web-console (3.7.0)
160154
actionview (>= 5.0)
@@ -164,12 +158,11 @@ GEM
164158
websocket-driver (0.6.5)
165159
websocket-extensions (>= 0.1.0)
166160
websocket-extensions (0.1.3)
167-
xpath (3.1.0)
161+
xpath (3.2.0)
168162
nokogiri (~> 1.8)
169163

170164
PLATFORMS
171-
x64-mingw32
172-
x86-mingw32
165+
ruby
173166

174167
DEPENDENCIES
175168
byebug
@@ -180,11 +173,11 @@ DEPENDENCIES
180173
rails (~> 5.1.2)
181174
sass-rails (~> 5.0)
182175
selenium-webdriver
183-
sqlite3
176+
sqlite3 (~> 1.3.13)
184177
turbolinks (~> 5)
185178
tzinfo-data
186179
uglifier (>= 1.3.0)
187180
web-console (>= 3.3.0)
188181

189182
BUNDLED WITH
190-
1.16.1
183+
1.17.0

vendor/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)