Merge branch 'add-puma-gem' into change-registrar-area-controller-hierarchy

This commit is contained in:
Artur Beljajev 2017-04-06 19:18:52 +03:00
commit a107a4fd26
2 changed files with 4 additions and 1 deletions

View file

@ -115,6 +115,7 @@ group :development do
# deploy
gem 'mina', '0.3.1' # for fast deployment
gem 'puma'
end
group :development, :test do

View file

@ -365,6 +365,7 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
puma (3.8.2)
que (0.10.0)
que-web (0.4.0)
erubis
@ -633,6 +634,7 @@ DEPENDENCIES
phantomjs-binaries (= 1.9.2.4)
poltergeist (= 1.6.0)
pry (= 0.10.1)
puma
que (= 0.10.0)
que-web (= 0.4.0)
que_mailer!
@ -662,4 +664,4 @@ DEPENDENCIES
whenever (= 0.9.4)
BUNDLED WITH
1.13.6
1.14.6