Skip to content

Commit a616f6b

Browse files
committed
Update rails
1 parent 1b32ccf commit a616f6b

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

Gemfile

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

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '~> 5.0.0'
5+
gem 'rails', '5.1.7'
66
# Use postgresql as the database for Active Record
77
gem 'pg', '~> 0.18'
88
# Use Puma as the app server
@@ -14,7 +14,7 @@ gem 'omniauth'
1414
gem 'rack-cors'
1515
# Use Rack attack for black/white listing, rate limiting, throttling
1616
gem 'rack-attack'
17-
# Actime Model Serializers provides a good way to
17+
# Actime Model Serializers provides a good way to
1818
gem 'active_model_serializers', '~> 0.10.0'
1919
# redis-rails for redis cacheing
2020
gem 'redis-rails'

Gemfile.lock

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.7.2)
5-
actionpack (= 5.0.7.2)
6-
nio4r (>= 1.2, < 3.0)
4+
actioncable (5.1.7)
5+
actionpack (= 5.1.7)
6+
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.7.2)
9-
actionpack (= 5.0.7.2)
10-
actionview (= 5.0.7.2)
11-
activejob (= 5.0.7.2)
8+
actionmailer (5.1.7)
9+
actionpack (= 5.1.7)
10+
actionview (= 5.1.7)
11+
activejob (= 5.1.7)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.0.7.2)
15-
actionview (= 5.0.7.2)
16-
activesupport (= 5.0.7.2)
14+
actionpack (5.1.7)
15+
actionview (= 5.1.7)
16+
activesupport (= 5.1.7)
1717
rack (~> 2.0)
18-
rack-test (~> 0.6.3)
18+
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.7.2)
22-
activesupport (= 5.0.7.2)
21+
actionview (5.1.7)
22+
activesupport (= 5.1.7)
2323
builder (~> 3.1)
24-
erubis (~> 2.7.0)
24+
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
2727
active_model_serializers (0.10.7)
2828
actionpack (>= 4.1, < 6)
2929
activemodel (>= 4.1, < 6)
3030
case_transform (>= 0.2)
3131
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
32-
activejob (5.0.7.2)
33-
activesupport (= 5.0.7.2)
32+
activejob (5.1.7)
33+
activesupport (= 5.1.7)
3434
globalid (>= 0.3.6)
35-
activemodel (5.0.7.2)
36-
activesupport (= 5.0.7.2)
37-
activerecord (5.0.7.2)
38-
activemodel (= 5.0.7.2)
39-
activesupport (= 5.0.7.2)
40-
arel (~> 7.0)
41-
activesupport (5.0.7.2)
35+
activemodel (5.1.7)
36+
activesupport (= 5.1.7)
37+
activerecord (5.1.7)
38+
activemodel (= 5.1.7)
39+
activesupport (= 5.1.7)
40+
arel (~> 8.0)
41+
activesupport (5.1.7)
4242
concurrent-ruby (~> 1.0, >= 1.0.2)
4343
i18n (>= 0.7, < 2)
4444
minitest (~> 5.1)
4545
tzinfo (~> 1.1)
46-
arel (7.1.4)
46+
arel (8.0.0)
4747
bcrypt (3.1.12)
4848
binding_of_caller (0.7.3)
4949
debug_inspector (>= 0.0.1)
@@ -66,7 +66,7 @@ GEM
6666
devise (> 3.5.2, < 4.7)
6767
rails (>= 4.2.0, < 6)
6868
diff-lcs (1.3)
69-
erubis (2.7.0)
69+
erubi (1.8.0)
7070
factory_girl (4.9.0)
7171
activesupport (>= 3.0.0)
7272
factory_girl_rails (4.9.0)
@@ -117,28 +117,28 @@ GEM
117117
rack-cors (1.0.2)
118118
rack-protection (2.0.0)
119119
rack
120-
rack-test (0.6.3)
121-
rack (>= 1.0)
122-
rails (5.0.7.2)
123-
actioncable (= 5.0.7.2)
124-
actionmailer (= 5.0.7.2)
125-
actionpack (= 5.0.7.2)
126-
actionview (= 5.0.7.2)
127-
activejob (= 5.0.7.2)
128-
activemodel (= 5.0.7.2)
129-
activerecord (= 5.0.7.2)
130-
activesupport (= 5.0.7.2)
120+
rack-test (1.1.0)
121+
rack (>= 1.0, < 3)
122+
rails (5.1.7)
123+
actioncable (= 5.1.7)
124+
actionmailer (= 5.1.7)
125+
actionpack (= 5.1.7)
126+
actionview (= 5.1.7)
127+
activejob (= 5.1.7)
128+
activemodel (= 5.1.7)
129+
activerecord (= 5.1.7)
130+
activesupport (= 5.1.7)
131131
bundler (>= 1.3.0)
132-
railties (= 5.0.7.2)
132+
railties (= 5.1.7)
133133
sprockets-rails (>= 2.0.0)
134134
rails-dom-testing (2.0.3)
135135
activesupport (>= 4.2.0)
136136
nokogiri (>= 1.6)
137137
rails-html-sanitizer (1.0.4)
138138
loofah (~> 2.2, >= 2.2.2)
139-
railties (5.0.7.2)
140-
actionpack (= 5.0.7.2)
141-
activesupport (= 5.0.7.2)
139+
railties (5.1.7)
140+
actionpack (= 5.1.7)
141+
activesupport (= 5.1.7)
142142
method_source
143143
rake (>= 0.8.7)
144144
thor (>= 0.18.1, < 2.0)
@@ -225,7 +225,7 @@ DEPENDENCIES
225225
puma (~> 3.0)
226226
rack-attack
227227
rack-cors
228-
rails (~> 5.0.0)
228+
rails (= 5.1.7)
229229
redis-rails
230230
rspec-rails (= 3.1.0)
231231
sidekiq

0 commit comments

Comments
 (0)