Skip to content

Commit 496e3c8

Browse files
committed
Less testing and use Puma that works on all platforms.
1 parent 56cc728 commit 496e3c8

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
sudo: false
2+
13
rvm:
2-
- 1.9.3
3-
- 2.0.0
4-
- 2.1.2
5-
- jruby-19mode
4+
- 2.3.0
65

76
language: ruby
87

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'grape-swagger'
77
gem 'activemodel'
88
gem 'kaminari', require: 'kaminari/grape'
99
gem 'rack-rewrite'
10-
gem 'unicorn'
10+
gem 'puma'
1111

1212
group :development do
1313
gem 'rake'

Gemfile.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ GEM
6666
grape (>= 0.8.0)
6767
grape-entity (< 0.5.0)
6868
hashie (3.4.3)
69-
hyperclient (0.8.0)
69+
hyperclient (0.8.1)
7070
faraday
7171
faraday-digestauth
7272
faraday_hal_middleware
@@ -80,7 +80,6 @@ GEM
8080
kaminari (0.16.3)
8181
actionpack (>= 3.0.0)
8282
activesupport (>= 3.0.0)
83-
kgio (2.10.0)
8483
loofah (2.0.3)
8584
nokogiri (>= 1.5.9)
8685
mini_portile2 (2.0.0)
@@ -94,13 +93,14 @@ GEM
9493
parser (2.3.0.6)
9594
ast (~> 2.2)
9695
powerpack (0.1.1)
96+
puma (3.1.0)
9797
rack (1.6.4)
9898
rack-accept (0.4.5)
9999
rack (>= 0.4)
100100
rack-cors (0.4.0)
101101
rack-mount (0.8.3)
102102
rack (>= 1.0.0)
103-
rack-rewrite (1.4.1)
103+
rack-rewrite (1.5.1)
104104
rack-test (0.6.3)
105105
rack (>= 1.0)
106106
rails-deprecated_sanitizer (1.0.3)
@@ -112,7 +112,6 @@ GEM
112112
rails-html-sanitizer (1.0.3)
113113
loofah (~> 2.0)
114114
rainbow (2.1.0)
115-
raindrops (0.15.0)
116115
rake (11.1.1)
117116
representable (2.3.0)
118117
uber (~> 0.0.7)
@@ -143,10 +142,6 @@ GEM
143142
thread_safe (~> 0.1)
144143
uber (0.0.15)
145144
unicode-display_width (1.0.2)
146-
unicorn (5.0.1)
147-
kgio (~> 2.6)
148-
rack
149-
raindrops (~> 0.7)
150145
uri_template (0.7.0)
151146
virtus (1.0.5)
152147
axiom-types (~> 0.1)
@@ -164,13 +159,13 @@ DEPENDENCIES
164159
grape-swagger
165160
hyperclient
166161
kaminari
162+
puma
167163
rack-cors
168164
rack-rewrite
169165
rack-test
170166
rake
171167
rspec
172168
rubocop
173-
unicorn
174169

175170
BUNDLED WITH
176171
1.10.6

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: bundle exec unicorn -p $PORT
1+
web: bundle exec puma -p $PORT

0 commit comments

Comments
 (0)