Skip to content

Commit 0e9f6f9

Browse files
committed
Update dependencies
1 parent b9056f5 commit 0e9f6f9

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem 'daemons', '~> 1.2.3'
1111
gem 'google-spreadsheet-ruby'
1212
gem 'mimemagic', '~> 0.3.0'
1313
gem 'natcmp', '~> 1.4'
14-
gem 'newrelic_rpm'
14+
gem 'newrelic_rpm', '~> 4.8', '>= 4.8.0.341'
1515
gem 'paperclip', '~> 5.0'
1616
gem 'pdfkit', '~> 0.8.2'
1717
gem 'pg', '~> 0.19.0'
@@ -23,7 +23,7 @@ gem 'transaction_isolation', '~> 1.0.3'
2323
gem 'xml-simple', '~> 1.1.1'
2424

2525
gem 'hiredis' # Redis for caching
26-
gem 'newrelic-redis'
26+
# gem 'newrelic-redis' blocks new relic updates
2727
gem 'readthis' # Redis for caching
2828

2929
gem 'doorkeeper'
@@ -46,7 +46,7 @@ group :assets do
4646
end
4747

4848
group :development, :test do
49-
gem 'capybara', '~> 2.5.0'
49+
gem 'capybara', '~> 2.17'
5050
gem 'factory_girl_rails', '~> 4.5.0'
5151
gem 'poltergeist', '~> 1.7.0'
5252
gem 'rspec', '~> 3.5.0'

Gemfile.lock

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ GEM
4545
public_suffix (>= 2.0.2, < 4.0)
4646
andand (1.3.3)
4747
arel (6.0.4)
48-
ast (2.3.0)
48+
ast (2.4.0)
4949
astrolabe (1.3.1)
5050
parser (~> 2.2)
5151
autoprefixer-rails (7.2.5)
@@ -61,12 +61,13 @@ GEM
6161
thor (~> 0.18)
6262
byebug (9.1.0)
6363
cancancan (1.13.1)
64-
capybara (2.5.0)
65-
mime-types (>= 1.16)
64+
capybara (2.17.0)
65+
addressable
66+
mini_mime (>= 0.1.3)
6667
nokogiri (>= 1.3.3)
6768
rack (>= 1.0.0)
6869
rack-test (>= 0.5.4)
69-
xpath (~> 2.0)
70+
xpath (>= 2.0, < 4.0)
7071
climate_control (0.2.0)
7172
cliver (0.3.2)
7273
cocaine (0.5.8)
@@ -95,7 +96,7 @@ GEM
9596
railties (>= 3.0.0)
9697
faraday (0.14.0)
9798
multipart-post (>= 1.2, < 3)
98-
ffi (1.9.18)
99+
ffi (1.9.21)
99100
font-awesome-rails (4.7.0.3)
100101
railties (>= 3.2, < 5.2)
101102
globalid (0.4.1)
@@ -129,7 +130,7 @@ GEM
129130
domain_name (~> 0.5)
130131
httpclient (2.8.3)
131132
hurley (0.2)
132-
i18n (0.9.1)
133+
i18n (0.9.3)
133134
concurrent-ruby (~> 1.0)
134135
jquery-rails (3.1.4)
135136
railties (>= 3.0, < 5.0)
@@ -167,19 +168,16 @@ GEM
167168
thin
168169
mini_mime (1.0.0)
169170
mini_portile2 (2.3.0)
170-
minitest (5.11.1)
171+
minitest (5.11.3)
171172
multi_json (1.13.1)
172173
multipart-post (2.0.0)
173174
natcmp (1.4.1)
174175
netrc (0.11.0)
175-
newrelic-redis (2.0.2)
176-
newrelic_rpm (~> 3.11)
177-
redis (< 4.0)
178-
newrelic_rpm (3.18.1.330)
179-
nokogiri (1.8.1)
176+
newrelic_rpm (4.8.0.341)
177+
nokogiri (1.8.2)
180178
mini_portile2 (~> 2.3.0)
181179
os (0.9.6)
182-
paperclip (5.1.0)
180+
paperclip (5.2.1)
183181
activemodel (>= 4.2.0)
184182
activesupport (>= 4.2.0)
185183
cocaine (~> 0.5.5)
@@ -248,7 +246,7 @@ GEM
248246
readthis (2.2.0)
249247
connection_pool (~> 2.1)
250248
redis (>= 3.0, < 5.0)
251-
redis (3.3.5)
249+
redis (4.0.1)
252250
representable (3.0.4)
253251
declarative (< 0.1.0)
254252
declarative-option (< 0.2.0)
@@ -340,21 +338,21 @@ GEM
340338
tins (1.6.0)
341339
transaction_isolation (1.0.3)
342340
activerecord (>= 3.0.11)
343-
tzinfo (1.2.4)
341+
tzinfo (1.2.5)
344342
thread_safe (~> 0.1)
345343
uber (0.1.0)
346344
uglifier (2.7.2)
347345
execjs (>= 0.3.0)
348346
json (>= 1.8.0)
349347
unf (0.1.4)
350348
unf_ext
351-
unf_ext (0.0.7.4)
349+
unf_ext (0.0.7.5)
352350
websocket-driver (0.7.0)
353351
websocket-extensions (>= 0.1.0)
354352
websocket-extensions (0.1.3)
355353
xml-simple (1.1.5)
356-
xpath (2.1.0)
357-
nokogiri (~> 1.3)
354+
xpath (3.0.0)
355+
nokogiri (~> 1.8)
358356

359357
PLATFORMS
360358
ruby
@@ -366,7 +364,7 @@ DEPENDENCIES
366364
brakeman
367365
bundler-audit
368366
cancancan (~> 1.13.0)
369-
capybara (~> 2.5.0)
367+
capybara (~> 2.17)
370368
daemons (~> 1.2.3)
371369
database_cleaner (~> 1.5.0)
372370
doorkeeper
@@ -382,8 +380,7 @@ DEPENDENCIES
382380
mimemagic (~> 0.3.0)
383381
mimic (~> 0.4.3)
384382
natcmp (~> 1.4)
385-
newrelic-redis
386-
newrelic_rpm
383+
newrelic_rpm (~> 4.8, >= 4.8.0.341)
387384
paperclip (~> 5.0)
388385
pdfkit (~> 0.8.2)
389386
pg (~> 0.19.0)

0 commit comments

Comments
 (0)