Skip to content

Commit 2efc74f

Browse files
sashazykovsashazykov
committed
upgraded rails and ffi gems
1 parent 339ee80 commit 2efc74f

2 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎Gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
ruby '2.4.2'
44

5-
gem 'rails', '4.2.10'
5+
gem 'rails', '4.2.11'
66

77
gem 'acts_as_paranoid', github: 'ActsAsParanoid/acts_as_paranoid'
88
gem 'airbrake', '~> 3.1.15'
@@ -23,7 +23,7 @@ gem 'jquery-turbolinks'
2323
gem 'kaminari', '~> 0.15.0'
2424
gem 'kaminari-i18n'
2525
gem 'less-rails', '~> 2.4.2'
26-
gem 'money-tree', '~> 0.9.0'
26+
gem 'money-tree', '~> 0.10.0'
2727
gem 'mysql2', group: :production
2828
gem 'octokit', '~> 4.7.0'
2929
gem 'omniauth', '~> 1.7.1'
@@ -66,6 +66,6 @@ group :test do
6666
gem 'rspec-activemodel-mocks'
6767
gem 'shoulda-matchers', '~> 3.1'
6868
gem 'simplecov'
69-
gem 'webmock'
7069
gem 'vcr'
70+
gem 'webmock'
7171
end

‎Gemfile.lock‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,36 @@ GIT
4343
GEM
4444
remote: https://rubygems.org/
4545
specs:
46-
actionmailer (4.2.10)
47-
actionpack (= 4.2.10)
48-
actionview (= 4.2.10)
49-
activejob (= 4.2.10)
46+
actionmailer (4.2.11)
47+
actionpack (= 4.2.11)
48+
actionview (= 4.2.11)
49+
activejob (= 4.2.11)
5050
mail (~> 2.5, >= 2.5.4)
5151
rails-dom-testing (~> 1.0, >= 1.0.5)
52-
actionpack (4.2.10)
53-
actionview (= 4.2.10)
54-
activesupport (= 4.2.10)
52+
actionpack (4.2.11)
53+
actionview (= 4.2.11)
54+
activesupport (= 4.2.11)
5555
rack (~> 1.6)
5656
rack-test (~> 0.6.2)
5757
rails-dom-testing (~> 1.0, >= 1.0.5)
5858
rails-html-sanitizer (~> 1.0, >= 1.0.2)
59-
actionview (4.2.10)
60-
activesupport (= 4.2.10)
59+
actionview (4.2.11)
60+
activesupport (= 4.2.11)
6161
builder (~> 3.1)
6262
erubis (~> 2.7.0)
6363
rails-dom-testing (~> 1.0, >= 1.0.5)
6464
rails-html-sanitizer (~> 1.0, >= 1.0.3)
65-
activejob (4.2.10)
66-
activesupport (= 4.2.10)
65+
activejob (4.2.11)
66+
activesupport (= 4.2.11)
6767
globalid (>= 0.3.0)
68-
activemodel (4.2.10)
69-
activesupport (= 4.2.10)
68+
activemodel (4.2.11)
69+
activesupport (= 4.2.11)
7070
builder (~> 3.1)
71-
activerecord (4.2.10)
72-
activemodel (= 4.2.10)
73-
activesupport (= 4.2.10)
71+
activerecord (4.2.11)
72+
activemodel (= 4.2.11)
73+
activesupport (= 4.2.11)
7474
arel (~> 6.0)
75-
activesupport (4.2.10)
75+
activesupport (4.2.11)
7676
i18n (~> 0.7)
7777
minitest (~> 5.1)
7878
thread_safe (~> 0.3, >= 0.3.4)
@@ -114,7 +114,7 @@ GEM
114114
execjs
115115
coffee-script-source (1.9.1.1)
116116
commonjs (0.2.7)
117-
concurrent-ruby (1.0.5)
117+
concurrent-ruby (1.1.3)
118118
connection_pool (2.2.0)
119119
crack (0.4.3)
120120
safe_yaml (~> 1.0.0)
@@ -160,7 +160,7 @@ GEM
160160
railties (>= 3.0.0)
161161
faraday (0.12.2)
162162
multipart-post (>= 1.2, < 3)
163-
ffi (1.9.18)
163+
ffi (1.9.25)
164164
gherkin (2.12.2)
165165
multi_json (~> 1.3)
166166
globalid (0.4.1)
@@ -178,7 +178,7 @@ GEM
178178
http-cookie (1.0.2)
179179
domain_name (~> 0.5)
180180
http_accept_language (2.0.2)
181-
i18n (0.9.1)
181+
i18n (0.9.5)
182182
concurrent-ruby (~> 1.0)
183183
i18n-js (2.1.2)
184184
i18n
@@ -205,16 +205,16 @@ GEM
205205
actionpack (>= 3.1)
206206
less (~> 2.4.0)
207207
libv8 (3.16.14.19)
208-
loofah (2.2.2)
208+
loofah (2.2.3)
209209
crass (~> 1.0.2)
210210
nokogiri (>= 1.5.9)
211-
mail (2.7.0)
211+
mail (2.7.1)
212212
mini_mime (>= 0.1.1)
213213
mime-types (2.99.3)
214-
mini_mime (1.0.0)
214+
mini_mime (1.0.1)
215215
mini_portile2 (2.3.0)
216-
minitest (5.10.3)
217-
money-tree (0.9.0)
216+
minitest (5.11.3)
217+
money-tree (0.10.0)
218218
ffi
219219
multi_json (1.13.1)
220220
multi_test (0.1.2)
@@ -225,7 +225,7 @@ GEM
225225
net-ssh (>= 2.6.5)
226226
net-ssh (4.1.0)
227227
netrc (0.11.0)
228-
nokogiri (1.8.2)
228+
nokogiri (1.8.5)
229229
mini_portile2 (~> 2.3.0)
230230
oauth2 (1.4.0)
231231
faraday (>= 0.8, < 0.13)
@@ -243,37 +243,37 @@ GEM
243243
omniauth (~> 1.2)
244244
orm_adapter (0.5.0)
245245
public_suffix (3.0.1)
246-
rack (1.6.10)
246+
rack (1.6.11)
247247
rack-test (0.6.3)
248248
rack (>= 1.0)
249-
rails (4.2.10)
250-
actionmailer (= 4.2.10)
251-
actionpack (= 4.2.10)
252-
actionview (= 4.2.10)
253-
activejob (= 4.2.10)
254-
activemodel (= 4.2.10)
255-
activerecord (= 4.2.10)
256-
activesupport (= 4.2.10)
249+
rails (4.2.11)
250+
actionmailer (= 4.2.11)
251+
actionpack (= 4.2.11)
252+
actionview (= 4.2.11)
253+
activejob (= 4.2.11)
254+
activemodel (= 4.2.11)
255+
activerecord (= 4.2.11)
256+
activesupport (= 4.2.11)
257257
bundler (>= 1.3.0, < 2.0)
258-
railties (= 4.2.10)
258+
railties (= 4.2.11)
259259
sprockets-rails
260260
rails-deprecated_sanitizer (1.0.3)
261261
activesupport (>= 4.2.0.alpha)
262-
rails-dom-testing (1.0.8)
263-
activesupport (>= 4.2.0.beta, < 5.0)
262+
rails-dom-testing (1.0.9)
263+
activesupport (>= 4.2.0, < 5.0)
264264
nokogiri (~> 1.6)
265265
rails-deprecated_sanitizer (>= 1.0.1)
266266
rails-html-sanitizer (1.0.4)
267267
loofah (~> 2.2, >= 2.2.2)
268268
rails-i18n (4.0.3)
269269
i18n (~> 0.6)
270270
railties (~> 4.0)
271-
railties (4.2.10)
272-
actionpack (= 4.2.10)
273-
activesupport (= 4.2.10)
271+
railties (4.2.11)
272+
actionpack (= 4.2.11)
273+
activesupport (= 4.2.11)
274274
rake (>= 0.8.7)
275275
thor (>= 0.18.1, < 2.0)
276-
rake (12.3.0)
276+
rake (12.3.1)
277277
rbnacl (3.4.0)
278278
ffi
279279
rbnacl-libsodium (1.0.11)
@@ -350,12 +350,12 @@ GEM
350350
therubyracer (0.12.3)
351351
libv8 (~> 3.16.14.15)
352352
ref
353-
thor (0.20.0)
353+
thor (0.20.3)
354354
thread_safe (0.3.6)
355355
tilt (1.4.1)
356356
turbolinks (2.5.3)
357357
coffee-rails
358-
tzinfo (1.2.4)
358+
tzinfo (1.2.5)
359359
thread_safe (~> 0.1)
360360
uglifier (2.4.0)
361361
execjs (>= 0.3.0)
@@ -404,12 +404,12 @@ DEPENDENCIES
404404
kaminari (~> 0.15.0)
405405
kaminari-i18n
406406
less-rails (~> 2.4.2)
407-
money-tree (~> 0.9.0)
407+
money-tree (~> 0.10.0)
408408
mysql2
409409
octokit (~> 4.7.0)
410410
omniauth (~> 1.7.1)
411411
omniauth-github!
412-
rails (= 4.2.10)
412+
rails (= 4.2.11)
413413
rails-i18n (~> 4.0.0)
414414
rbnacl (~> 3.4.0)
415415
rbnacl-libsodium (~> 1.0.0)

0 commit comments

Comments
 (0)