Skip to content

Commit 633d6ab

Browse files
authored
Merge pull request #291 from platanus/rjherrerabot/bundler/rails-4.2.11.1
chore(deps): bump rails from 4.2.10 to 4.2.11.1
2 parents 48e5b60 + 951045c commit 633d6ab

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

Gemfile.lock

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,37 @@ GEM
3131
specs:
3232
aasm (4.12.3)
3333
concurrent-ruby (~> 1.0)
34-
actionmailer (4.2.10)
35-
actionpack (= 4.2.10)
36-
actionview (= 4.2.10)
37-
activejob (= 4.2.10)
34+
actionmailer (4.2.11.1)
35+
actionpack (= 4.2.11.1)
36+
actionview (= 4.2.11.1)
37+
activejob (= 4.2.11.1)
3838
mail (~> 2.5, >= 2.5.4)
3939
rails-dom-testing (~> 1.0, >= 1.0.5)
40-
actionpack (4.2.10)
41-
actionview (= 4.2.10)
42-
activesupport (= 4.2.10)
40+
actionpack (4.2.11.1)
41+
actionview (= 4.2.11.1)
42+
activesupport (= 4.2.11.1)
4343
rack (~> 1.6)
4444
rack-test (~> 0.6.2)
4545
rails-dom-testing (~> 1.0, >= 1.0.5)
4646
rails-html-sanitizer (~> 1.0, >= 1.0.2)
47-
actionview (4.2.10)
48-
activesupport (= 4.2.10)
47+
actionview (4.2.11.1)
48+
activesupport (= 4.2.11.1)
4949
builder (~> 3.1)
5050
erubis (~> 2.7.0)
5151
rails-dom-testing (~> 1.0, >= 1.0.5)
5252
rails-html-sanitizer (~> 1.0, >= 1.0.3)
5353
active_material (1.4.2)
54-
activejob (4.2.10)
55-
activesupport (= 4.2.10)
54+
activejob (4.2.11.1)
55+
activesupport (= 4.2.11.1)
5656
globalid (>= 0.3.0)
57-
activemodel (4.2.10)
58-
activesupport (= 4.2.10)
57+
activemodel (4.2.11.1)
58+
activesupport (= 4.2.11.1)
5959
builder (~> 3.1)
60-
activerecord (4.2.10)
61-
activemodel (= 4.2.10)
62-
activesupport (= 4.2.10)
60+
activerecord (4.2.11.1)
61+
activemodel (= 4.2.11.1)
62+
activesupport (= 4.2.11.1)
6363
arel (~> 6.0)
64-
activesupport (4.2.10)
64+
activesupport (4.2.11.1)
6565
i18n (~> 0.7)
6666
minitest (~> 5.1)
6767
thread_safe (~> 0.3, >= 0.3.4)
@@ -116,7 +116,7 @@ GEM
116116
formtastic (3.1.5)
117117
actionpack (>= 3.2.13)
118118
formtastic_i18n (0.6.0)
119-
globalid (0.4.1)
119+
globalid (0.4.2)
120120
activesupport (>= 4.2.0)
121121
guard (2.14.2)
122122
formatador (>= 0.2.4)
@@ -166,14 +166,14 @@ GEM
166166
crass (~> 1.0.2)
167167
nokogiri (>= 1.5.9)
168168
lumberjack (1.0.12)
169-
mail (2.7.0)
169+
mail (2.7.1)
170170
mini_mime (>= 0.1.1)
171171
method_source (0.9.0)
172172
mime-types (3.1)
173173
mime-types-data (~> 3.2015)
174174
mime-types-data (3.2016.0521)
175175
mimemagic (0.3.2)
176-
mini_mime (1.0.0)
176+
mini_mime (1.0.2)
177177
mini_portile2 (2.4.0)
178178
minitest (5.14.0)
179179
nenv (0.3.0)
@@ -200,16 +200,16 @@ GEM
200200
rack (1.6.13)
201201
rack-test (0.6.3)
202202
rack (>= 1.0)
203-
rails (4.2.10)
204-
actionmailer (= 4.2.10)
205-
actionpack (= 4.2.10)
206-
actionview (= 4.2.10)
207-
activejob (= 4.2.10)
208-
activemodel (= 4.2.10)
209-
activerecord (= 4.2.10)
210-
activesupport (= 4.2.10)
203+
rails (4.2.11.1)
204+
actionmailer (= 4.2.11.1)
205+
actionpack (= 4.2.11.1)
206+
actionview (= 4.2.11.1)
207+
activejob (= 4.2.11.1)
208+
activemodel (= 4.2.11.1)
209+
activerecord (= 4.2.11.1)
210+
activesupport (= 4.2.11.1)
211211
bundler (>= 1.3.0, < 2.0)
212-
railties (= 4.2.10)
212+
railties (= 4.2.11.1)
213213
sprockets-rails
214214
rails-deprecated_sanitizer (1.0.3)
215215
activesupport (>= 4.2.0.alpha)
@@ -219,9 +219,9 @@ GEM
219219
rails-deprecated_sanitizer (>= 1.0.1)
220220
rails-html-sanitizer (1.3.0)
221221
loofah (~> 2.3)
222-
railties (4.2.10)
223-
actionpack (= 4.2.10)
224-
activesupport (= 4.2.10)
222+
railties (4.2.11.1)
223+
actionpack (= 4.2.11.1)
224+
activesupport (= 4.2.11.1)
225225
rake (>= 0.8.7)
226226
thor (>= 0.18.1, < 2.0)
227227
rake (13.0.1)

0 commit comments

Comments
 (0)