Skip to content

Commit d0eca23

Browse files
sashazykovsashazykov
committed
upgraded ruby and some gems
1 parent b5128d6 commit d0eca23

4 files changed

Lines changed: 56 additions & 54 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git:
66
depth: 10
77

88
rvm:
9-
- 2.4.5
9+
- 2.4.9
1010

1111
bundler_args: --without development --jobs=9 --retry=2 --quiet
1212

‎Gemfile‎

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

3-
ruby '2.4.5'
3+
ruby '2.4.9'
44

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

77
gem 'acts_as_paranoid', github: 'ActsAsParanoid/acts_as_paranoid'
88
gem 'airbrake', '~> 3.1.15'
9+
gem 'bcrypt', '~> 3.1.12'
910
gem 'bootstrap_form', github: 'bootstrap-ruby/rails-bootstrap-forms'
1011
gem 'cancancan'
1112
gem 'coffee-rails', '~> 4.0.0'
@@ -24,7 +25,7 @@ gem 'kaminari', '~> 0.15.0'
2425
gem 'kaminari-i18n'
2526
gem 'less-rails', '~> 2.4.2'
2627
gem 'money-tree', '~> 0.10.0'
27-
gem 'mysql2', group: :production
28+
gem 'mysql2', '~> 0.4.10', group: :production
2829
gem 'octokit', '~> 4.7.0'
2930
gem 'omniauth', '~> 1.7.1'
3031
gem 'omniauth-github', github: 'alexandrz/omniauth-github', branch: 'provide_emails'

‎Gemfile.lock‎

Lines changed: 50 additions & 49 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.11)
47-
actionpack (= 4.2.11)
48-
actionview (= 4.2.11)
49-
activejob (= 4.2.11)
46+
actionmailer (4.2.11.3)
47+
actionpack (= 4.2.11.3)
48+
actionview (= 4.2.11.3)
49+
activejob (= 4.2.11.3)
5050
mail (~> 2.5, >= 2.5.4)
5151
rails-dom-testing (~> 1.0, >= 1.0.5)
52-
actionpack (4.2.11)
53-
actionview (= 4.2.11)
54-
activesupport (= 4.2.11)
52+
actionpack (4.2.11.3)
53+
actionview (= 4.2.11.3)
54+
activesupport (= 4.2.11.3)
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.11)
60-
activesupport (= 4.2.11)
59+
actionview (4.2.11.3)
60+
activesupport (= 4.2.11.3)
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.11)
66-
activesupport (= 4.2.11)
65+
activejob (4.2.11.3)
66+
activesupport (= 4.2.11.3)
6767
globalid (>= 0.3.0)
68-
activemodel (4.2.11)
69-
activesupport (= 4.2.11)
68+
activemodel (4.2.11.3)
69+
activesupport (= 4.2.11.3)
7070
builder (~> 3.1)
71-
activerecord (4.2.11)
72-
activemodel (= 4.2.11)
73-
activesupport (= 4.2.11)
71+
activerecord (4.2.11.3)
72+
activemodel (= 4.2.11.3)
73+
activesupport (= 4.2.11.3)
7474
arel (~> 6.0)
75-
activesupport (4.2.11)
75+
activesupport (4.2.11.3)
7676
i18n (~> 0.7)
7777
minitest (~> 5.1)
7878
thread_safe (~> 0.3, >= 0.3.4)
@@ -83,9 +83,9 @@ GEM
8383
builder
8484
multi_json
8585
arel (6.0.4)
86-
bcrypt (3.1.10)
86+
bcrypt (3.1.16)
8787
bcrypt_pbkdf (1.0.0)
88-
builder (3.2.3)
88+
builder (3.2.4)
8989
cancancan (1.7.1)
9090
capistrano (3.4.1)
9191
i18n
@@ -114,11 +114,11 @@ GEM
114114
execjs
115115
coffee-script-source (1.9.1.1)
116116
commonjs (0.2.7)
117-
concurrent-ruby (1.1.3)
117+
concurrent-ruby (1.1.7)
118118
connection_pool (2.2.0)
119119
crack (0.4.3)
120120
safe_yaml (~> 1.0.0)
121-
crass (1.0.5)
121+
crass (1.0.6)
122122
cucumber (1.3.20)
123123
builder (>= 2.1.2)
124124
diff-lcs (>= 1.1.3)
@@ -163,7 +163,7 @@ GEM
163163
ffi (1.9.25)
164164
gherkin (2.12.2)
165165
multi_json (~> 1.3)
166-
globalid (0.4.1)
166+
globalid (0.4.2)
167167
activesupport (>= 4.2.0)
168168
haml (4.0.5)
169169
tilt
@@ -205,27 +205,27 @@ GEM
205205
actionpack (>= 3.1)
206206
less (~> 2.4.0)
207207
libv8 (3.16.14.19)
208-
loofah (2.3.1)
208+
loofah (2.7.0)
209209
crass (~> 1.0.2)
210210
nokogiri (>= 1.5.9)
211211
mail (2.7.1)
212212
mini_mime (>= 0.1.1)
213213
mime-types (2.99.3)
214-
mini_mime (1.0.1)
214+
mini_mime (1.0.2)
215215
mini_portile2 (2.4.0)
216-
minitest (5.11.3)
216+
minitest (5.14.2)
217217
money-tree (0.10.0)
218218
ffi
219-
multi_json (1.13.1)
219+
multi_json (1.15.0)
220220
multi_test (0.1.2)
221221
multi_xml (0.6.0)
222222
multipart-post (2.0.0)
223-
mysql2 (0.3.14)
223+
mysql2 (0.4.10)
224224
net-scp (1.2.1)
225225
net-ssh (>= 2.6.5)
226226
net-ssh (4.1.0)
227227
netrc (0.11.0)
228-
nokogiri (1.10.8)
228+
nokogiri (1.10.10)
229229
mini_portile2 (~> 2.4.0)
230230
oauth2 (1.4.0)
231231
faraday (>= 0.8, < 0.13)
@@ -243,34 +243,34 @@ GEM
243243
omniauth (~> 1.2)
244244
orm_adapter (0.5.0)
245245
public_suffix (3.0.1)
246-
rack (1.6.12)
246+
rack (1.6.13)
247247
rack-test (0.6.3)
248248
rack (>= 1.0)
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)
249+
rails (4.2.11.3)
250+
actionmailer (= 4.2.11.3)
251+
actionpack (= 4.2.11.3)
252+
actionview (= 4.2.11.3)
253+
activejob (= 4.2.11.3)
254+
activemodel (= 4.2.11.3)
255+
activerecord (= 4.2.11.3)
256+
activesupport (= 4.2.11.3)
257257
bundler (>= 1.3.0, < 2.0)
258-
railties (= 4.2.11)
258+
railties (= 4.2.11.3)
259259
sprockets-rails
260260
rails-deprecated_sanitizer (1.0.3)
261261
activesupport (>= 4.2.0.alpha)
262262
rails-dom-testing (1.0.9)
263263
activesupport (>= 4.2.0, < 5.0)
264264
nokogiri (~> 1.6)
265265
rails-deprecated_sanitizer (>= 1.0.1)
266-
rails-html-sanitizer (1.0.4)
267-
loofah (~> 2.2, >= 2.2.2)
266+
rails-html-sanitizer (1.3.0)
267+
loofah (~> 2.3)
268268
rails-i18n (4.0.3)
269269
i18n (~> 0.6)
270270
railties (~> 4.0)
271-
railties (4.2.11)
272-
actionpack (= 4.2.11)
273-
activesupport (= 4.2.11)
271+
railties (4.2.11.3)
272+
actionpack (= 4.2.11.3)
273+
activesupport (= 4.2.11.3)
274274
rake (>= 0.8.7)
275275
thor (>= 0.18.1, < 2.0)
276276
rake (13.0.1)
@@ -350,12 +350,12 @@ GEM
350350
therubyracer (0.12.3)
351351
libv8 (~> 3.16.14.15)
352352
ref
353-
thor (0.20.3)
353+
thor (1.0.1)
354354
thread_safe (0.3.6)
355355
tilt (1.4.1)
356356
turbolinks (2.5.3)
357357
coffee-rails
358-
tzinfo (1.2.5)
358+
tzinfo (1.2.7)
359359
thread_safe (~> 0.1)
360360
uglifier (2.4.0)
361361
execjs (>= 0.3.0)
@@ -379,6 +379,7 @@ PLATFORMS
379379
DEPENDENCIES
380380
acts_as_paranoid!
381381
airbrake (~> 3.1.15)
382+
bcrypt (~> 3.1.12)
382383
bcrypt_pbkdf (~> 1.0.0)
383384
bootstrap_form!
384385
cancancan
@@ -405,11 +406,11 @@ DEPENDENCIES
405406
kaminari-i18n
406407
less-rails (~> 2.4.2)
407408
money-tree (~> 0.10.0)
408-
mysql2
409+
mysql2 (~> 0.4.10)
409410
octokit (~> 4.7.0)
410411
omniauth (~> 1.7.1)
411412
omniauth-github!
412-
rails (= 4.2.11)
413+
rails (= 4.2.11.3)
413414
rails-i18n (~> 4.0.0)
414415
rbnacl (~> 3.4.0)
415416
rbnacl-libsodium (~> 1.0.0)
@@ -434,7 +435,7 @@ DEPENDENCIES
434435
webmock
435436

436437
RUBY VERSION
437-
ruby 2.4.2p198
438+
ruby 2.4.9p362
438439

439440
BUNDLED WITH
440-
1.16.0
441+
1.17.3

‎config/deploy.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
set :scm, :git
88

99
set :rvm_type, :user
10-
set :rvm_ruby_version, '2.4.5'
10+
set :rvm_ruby_version, '2.4.9'
1111
set :rvm_custom_path, '~/.rvm'
1212

1313
set :format, :pretty

0 commit comments

Comments
 (0)