Download as
Browse Code »

Commit 1738c17f331ca84700e028b653c3c4cb5b1eb7a8

Authored by Dmitriy Zaporozhets
1 parent 2643ee72
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update puma

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
@@ -76,7 +76,7 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup' @@ -76,7 +76,7 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup'
76 gem "asciidoctor" 76 gem "asciidoctor"
77 77
78 # Servers 78 # Servers
79 -gem "puma", '~> 2.1.1' 79 +gem "puma", '~> 2.3.0'
80 80
81 # State machine 81 # State machine
82 gem "state_machine" 82 gem "state_machine"
@@ -306,7 +306,7 @@ GEM @@ -306,7 +306,7 @@ GEM
306 coderay (~> 1.0.5) 306 coderay (~> 1.0.5)
307 method_source (~> 0.8) 307 method_source (~> 0.8)
308 slop (~> 3.4) 308 slop (~> 3.4)
309 - puma (2.1.1) 309 + puma (2.3.0)
310 rack (>= 1.1, < 2.0) 310 rack (>= 1.1, < 2.0)
311 pygments.rb (0.4.2) 311 pygments.rb (0.4.2)
312 posix-spawn (~> 0.3.6) 312 posix-spawn (~> 0.3.6)
@@ -576,7 +576,7 @@ DEPENDENCIES @@ -576,7 +576,7 @@ DEPENDENCIES
576 pg 576 pg
577 poltergeist (~> 1.3.0) 577 poltergeist (~> 1.3.0)
578 pry 578 pry
579 - puma (~> 2.1.1) 579 + puma (~> 2.3.0)
580 quiet_assets (~> 1.0.1) 580 quiet_assets (~> 1.0.1)
581 rack-mini-profiler 581 rack-mini-profiler
582 rails (= 3.2.13) 582 rails (= 3.2.13)