Skip to content

Commit

Permalink
Merge c9ee9ac into 31a85b7
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasknoepfle committed Feb 12, 2020
2 parents 31a85b7 + c9ee9ac commit f9f89df
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.8
2.6.5
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ gem 'active_data'

## Indexing /Searching
gem 'chewy', '= 5.0.0'
gem 'elasticsearch', '= 2.0.0'
gem 'elasticsearch', '= 5.0.5'
gem 'faraday', '0.15.4'

# ---------- View ----------

gem 'slim-rails'
Expand Down Expand Up @@ -150,7 +152,6 @@ group :test do
gem 'mocha'
gem 'webmock'
gem 'fakeredis'
gem 'fakeweb', '~> 1.3'
gem 'rack-contrib' # fake fastbill

# Gem for testing emails
Expand Down
17 changes: 8 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,13 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
e2mmap (0.1.0)
elasticsearch (2.0.0)
elasticsearch-api (= 2.0.0)
elasticsearch-transport (= 2.0.0)
elasticsearch-api (2.0.0)
elasticsearch (5.0.5)
elasticsearch-api (= 5.0.5)
elasticsearch-transport (= 5.0.5)
elasticsearch-api (5.0.5)
multi_json
elasticsearch-dsl (0.1.9)
elasticsearch-transport (2.0.0)
elasticsearch-transport (5.0.5)
faraday
multi_json
email_spec (2.2.0)
Expand Down Expand Up @@ -229,8 +229,7 @@ GEM
i18n (>= 1.6, < 2)
fakeredis (0.7.0)
redis (>= 3.2, < 5.0)
fakeweb (1.3.0)
faraday (1.0.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
font-awesome-rails (4.7.0.5)
Expand Down Expand Up @@ -649,15 +648,15 @@ DEPENDENCIES
dalli
delayed_paperclip (= 2.9.2)
devise
elasticsearch (= 2.0.0)
elasticsearch (= 5.0.5)
email_spec
enumerize (>= 0.5.1)
exception_notification
eye
factory_bot_rails (~> 4.11.1)
faker
fakeredis
fakeweb (~> 1.3)
faraday (= 0.15.4)
fastbill-automatic!
font-awesome-rails (>= 4.2.0.0)
formtastic
Expand Down

0 comments on commit f9f89df

Please sign in to comment.