Commit 07bce4d0 by source_reader

revert bcrypt due to armhf bug and increase timeouts

parent 85170001
......@@ -22,8 +22,8 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
# revert from 3.1.13 due to armhf bug
gem 'bcrypt', '3.1.12'
# Use Unicorn as the app server
# gem 'unicorn'
......
......@@ -50,7 +50,7 @@ GEM
arel (9.0.0)
ast (2.4.0)
backports (3.15.0)
bcrypt (3.1.13)
bcrypt (3.1.12)
bindex (0.8.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
......@@ -408,6 +408,7 @@ PLATFORMS
x64-mingw32
DEPENDENCIES
bcrypt (= 3.1.12)
bootsnap
byebug
capistrano (~> 3.6)
......
......@@ -3,9 +3,9 @@ module Joule
# Wrapper around Joule HTTP service
class Backend
include HTTParty
default_timeout 5
open_timeout 5
read_timeout 5
default_timeout 15
open_timeout 15
read_timeout 15
attr_reader :url
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment