Skip to content

Commit b7a9a48

Browse files
committed
update sinatra and removed backports
Charlie thinks we have a memory leak due to the linear growth of the GC total allocated objects graph
1 parent 69c277c commit b7a9a48

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

Gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'travis-config', '~> 1.0.0'
88
gem 'sidekiq', '~> 4.0.0'
99
gem 'redis-namespace'
1010

11-
gem 'sinatra', '~> 1.4.2'
11+
gem 'sinatra', '~> 2.0.0'
1212
gem 'rake', '~> 0.9.2.2'
1313

1414
gem 'sentry-raven'
@@ -18,9 +18,6 @@ gem 'activesupport', '~> 4.1.11'
1818
gem 'metriks'
1919
gem 'metriks-librato_metrics'
2020

21-
# backports 2.5.0 breaks rails routes
22-
gem 'backports', '2.4.0'
23-
2421
# structures
2522
gem 'yajl-ruby', '~> 1.4.0'
2623

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ GEM
2323
atomic (1.1.99)
2424
avl_tree (1.2.1)
2525
atomic (~> 1.1)
26-
backports (2.4.0)
2726
coderay (1.1.2)
2827
concurrent-ruby (1.0.5)
2928
connection_pool (2.2.1)
@@ -47,11 +46,12 @@ GEM
4746
metriks (>= 0.9.9.6)
4847
minitest (5.11.3)
4948
multipart-post (2.0.0)
49+
mustermann (1.0.2)
5050
pry (0.11.3)
5151
coderay (~> 1.1.0)
5252
method_source (~> 0.9.0)
53-
rack (1.6.10)
54-
rack-protection (1.5.5)
53+
rack (2.0.5)
54+
rack-protection (2.0.1)
5555
rack
5656
rack-test (1.0.0)
5757
rack (>= 1.0, < 3)
@@ -74,10 +74,11 @@ GEM
7474
concurrent-ruby (~> 1.0)
7575
connection_pool (~> 2.2, >= 2.2.0)
7676
redis (~> 3.2, >= 3.2.1)
77-
sinatra (1.4.8)
78-
rack (~> 1.5)
79-
rack-protection (~> 1.4)
80-
tilt (>= 1.3, < 3)
77+
sinatra (2.0.1)
78+
mustermann (~> 1.0)
79+
rack (~> 2.0)
80+
rack-protection (= 2.0.1)
81+
tilt (~> 2.0)
8182
thor (0.20.0)
8283
thread_safe (0.3.6)
8384
tilt (2.0.8)
@@ -96,7 +97,6 @@ PLATFORMS
9697

9798
DEPENDENCIES
9899
activesupport (~> 4.1.11)
99-
backports (= 2.4.0)
100100
foreman (~> 0.41.0)
101101
jemalloc!
102102
metriks
@@ -108,7 +108,7 @@ DEPENDENCIES
108108
rspec (~> 2.9)
109109
sentry-raven
110110
sidekiq (~> 4.0.0)
111-
sinatra (~> 1.4.2)
111+
sinatra (~> 2.0.0)
112112
travis-config (~> 1.0.0)
113113
travis-support!
114114
unicorn (~> 4.6.2)

0 commit comments

Comments
 (0)