Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump nokogiri from 1.6.2.1 to 1.13.9 #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 78 additions & 64 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
xrono (1.0.14)
xrono (1.0.16)
acl9
acts-as-taggable-on
acts_as_commentable
Expand Down Expand Up @@ -39,7 +39,7 @@ PATH
GEM
remote: http://rubygems.org/
specs:
acl9 (1.2.0)
acl9 (2.1.2)
rails (~> 4.0)
actionmailer (4.0.6)
actionpack (= 4.0.6)
Expand All @@ -65,19 +65,18 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
acts-as-taggable-on (3.4.3)
activerecord (>= 3.2, < 5)
acts-as-taggable-on (4.0.0)
activerecord (>= 4.0)
acts_as_commentable (4.0.2)
arel (4.0.2)
attr_encrypted (1.2.1)
encryptor (>= 1.1.1)
autoprefixer-rails (5.0.0.3)
execjs
json
bcrypt (3.1.9)
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
bcrypt (3.1.18)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.1.4)
capistrano (2.8.0)
highline
Expand All @@ -91,41 +90,37 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid (0.18.0)
timers (~> 4)
childprocess (0.5.3)
ffi (~> 1.0, >= 1.0.11)
chosen-rails (1.3.0)
chosen-rails (1.8.7)
coffee-rails (>= 3.2)
compass-rails (>= 1.1.2)
railties (>= 3.0)
sass-rails (>= 3.2)
chunky_png (1.3.3)
chunky_png (1.4.0)
ci_reporter (1.9.2)
builder (>= 2.1.2)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.5)
climate_control (>= 0.0.3, < 1.0)
climate_control (0.2.0)
cocaine (0.6.0)
terrapin (= 0.6.0)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.12.2)
combustion (0.3.1)
rails (>= 3.1.0)
thor (>= 0.14.6)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (2.0.0)
compass (>= 0.12.2)
configuration (1.3.4)
connection_pool (2.1.1)
connection_pool (2.3.0)
css3-progress-bar-rails (0.2.2)
rails
cucumber (1.1.9)
Expand All @@ -135,7 +130,7 @@ GEM
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
database_cleaner (0.7.2)
devise (3.4.1)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand All @@ -146,57 +141,61 @@ GEM
devise (>= 2.1.0)
diff-lcs (1.2.5)
docile (1.1.5)
doorkeeper (2.1.0)
railties (>= 3.1)
doorkeeper (3.1.0)
railties (>= 3.2)
dynamic_form (1.0.0)
encryptor (1.3.0)
encryptor (3.0.0)
erubis (2.7.0)
execjs (2.2.2)
execjs (2.8.1)
faker (0.9.5)
i18n (~> 0.4)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
faraday (2.6.0)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.1)
ffi (1.9.3)
forgery (0.3.10)
nokogiri (~> 1.4)
fssm (0.2.10)
gherkin (2.9.3)
json (>= 1.4.6)
googlecharts (1.6.10)
googlecharts (1.6.12)
gravtastic (3.2.6)
grit (2.4.1)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
haml (4.0.6)
haml (6.0.7)
temple (>= 0.8.2)
thor
tilt
hashie (5.0.0)
highline (1.6.21)
hike (1.2.3)
hitimes (1.2.2)
i18n (0.7.0)
jquery-rails (3.1.2)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
json (1.8.1)
jwt (1.2.1)
kramdown (1.5.0)
jwt (2.5.0)
kramdown (2.4.0)
rexml
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
macaddr (1.7.1)
systemu (~> 2.6.2)
macaddr (1.7.2)
systemu (~> 2.6.5)
machinist (1.0.6)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
mini_portile2 (2.8.0)
minitest (4.7.5)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
multi_xml (0.6.0)
mysql2 (0.3.16)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand All @@ -205,14 +204,16 @@ GEM
net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
orm_adapter (0.5.0)
paper_trail (3.0.0)
activerecord (>= 3.0, < 5.0)
Expand All @@ -227,12 +228,13 @@ GEM
cucumber (>= 0.8)
rake
polyglot (0.3.5)
protected_attributes (1.0.8)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
racc (1.6.0)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
Expand All @@ -250,11 +252,15 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
redis (3.2.0)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
redis (5.0.5)
redis-client (>= 0.9.0)
redis-client (0.10.0)
connection_pool
redis-namespace (1.9.0)
redis (>= 4)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rexml (3.2.5)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
Expand All @@ -271,13 +277,16 @@ GEM
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
ruby2_keywords (0.0.5)
rubyzip (1.1.4)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (2.42.0)
childprocess (>= 0.5.0)
multi_json (~> 1.0)
Expand All @@ -293,9 +302,9 @@ GEM
redis-namespace (>= 1.3.1)
simple-navigation (3.14.0)
activesupport (>= 2.3.2)
simple-navigation-bootstrap (1.0.0)
simple-navigation-bootstrap (1.0.2)
railties (>= 3.1)
simple-navigation (>= 3.7.0)
simple-navigation (>= 3.7.0, < 4.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
Expand All @@ -304,6 +313,9 @@ GEM
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.5.0)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
spork (0.9.0.rc9)
sprockets (2.11.0)
hike (~> 1.2)
Expand All @@ -315,25 +327,27 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
state_machine (1.0.3)
systemu (2.6.4)
systemu (2.6.5)
temple (0.8.2)
term-ansicolor (1.3.0)
tins (~> 1.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
timers (4.0.1)
hitimes
timers (4.3.5)
tins (1.3.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.42)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuid (2.3.7)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
uuid (2.3.9)
macaddr (~> 1.0)
warden (1.2.3)
version_gem (1.1.1)
warden (1.2.7)
rack (>= 1.0)
websocket (1.0.7)
xpath (2.0.0)
Expand Down