Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ gem 'will_paginate', '~> 3.1.0'

gem 'elasticsearch-model'
gem 'elasticsearch-rails'
gem 'nokogiri', '~> 1.6'
gem 'nokogiri', '~> 1.9'
gem 'dalli'

gem 'bootstrap-sass', '~> 3.3.6'
Expand Down
63 changes: 35 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bcrypt (3.1.11)
bcrypt (3.1.11-x86-mingw32)
bonsai-elasticsearch-rails (0.0.4)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
builder (3.2.4)
byebug (10.0.2)
carrierwave (1.0.0.beta)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
Expand Down Expand Up @@ -86,8 +88,9 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
concurrent-ruby (1.1.8)
connection_pool (2.2.0)
crass (1.0.6)
dalli (2.7.6)
debug_inspector (0.0.2)
devise (4.2.0)
Expand All @@ -110,7 +113,7 @@ GEM
faraday
multi_json
erubis (2.7.0)
excon (0.52.0)
excon (0.81.0)
execjs (2.7.0)
faker (1.6.3)
i18n (~> 0.5)
Expand Down Expand Up @@ -161,9 +164,9 @@ GEM
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.42.0)
fog-core (1.45.0)
builder
excon (~> 0.49)
excon (~> 0.58)
formatador (~> 0.2)
fog-dynect (0.0.3)
fog-core
Expand All @@ -185,10 +188,9 @@ GEM
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-profitbricks (0.0.5)
fog-core
fog-xml
nokogiri
fog-profitbricks (4.1.1)
fog-core (~> 1.42)
fog-json (~> 1.0)
fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
Expand Down Expand Up @@ -221,9 +223,9 @@ GEM
fog-xenserver (0.2.3)
fog-core
fog-xml
fog-xml (0.1.2)
fog-xml (0.1.3)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-sass (4.6.2)
sass (>= 3.2)
formatador (0.2.5)
Expand All @@ -232,8 +234,10 @@ GEM
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ice_cube (0.14.0)
inflecto (0.0.2)
ipaddress (0.8.3)
Expand All @@ -250,7 +254,8 @@ GEM
turbolinks
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
Expand All @@ -262,16 +267,17 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (3.8.0)
subexec (~> 0.2.1)
mini_portile2 (2.1.0)
minitest (5.9.0)
mini_portile2 (2.4.0)
minitest (5.14.4)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-ssh (3.1.1)
nio4r (1.2.1)
nokogiri (1.6.8-x86-mingw32)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nokogiri (1.9.1)
mini_portile2 (~> 2.4.0)
nokogiri (1.9.1-x86-mingw32)
mini_portile2 (~> 2.4.0)
oauth (0.5.1)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
Expand Down Expand Up @@ -299,10 +305,10 @@ GEM
json (~> 1.3)
omniauth-oauth (~> 1.1)
orm_adapter (0.5.0)
pg (0.18.4)
pg (0.18.4-x86-mingw32)
pkg-config (1.1.7)
puma (3.6.0)
rack (2.0.1)
rack (2.1.4)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
Expand All @@ -319,11 +325,11 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
Expand Down Expand Up @@ -378,14 +384,14 @@ GEM
sprockets (>= 3.0.0)
subexec (0.2.3)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (2.0.5)
timers (4.1.1)
hitimes
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo-data (1.2016.6)
tzinfo (>= 1.0.0)
Expand All @@ -405,6 +411,7 @@ GEM
xml-simple (1.1.5)

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
Expand All @@ -428,7 +435,7 @@ DEPENDENCIES
meta-tags
mini_magick (= 3.8.0)
net-ssh
nokogiri (~> 1.6)
nokogiri (~> 1.9)
omniauth-facebook
omniauth-google-oauth2
omniauth-twitter
Expand Down