Merge pull request #454 from cantino/bump_gems

update gems

Andrew Cantino 10 ans auparavant
Parent
Commettre
aa8ebe40fd
2 fichiers modifiés avec 50 ajouts et 47 suppressions
  1. 1 1
      Gemfile
  2. 49 46
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -11,7 +11,7 @@ gem 'bundler', '>= 1.5.0'
11 11
 
12 12
 gem 'protected_attributes', '~>1.0.8'
13 13
 
14
-gem 'rails' , '4.1.4'
14
+gem 'rails' , '4.1.5'
15 15
 
16 16
 case RUBY_PLATFORM
17 17
 when /freebsd|netbsd|openbsd/

+ 49 - 46
Gemfile.lock

@@ -12,27 +12,27 @@ GEM
12 12
   remote: https://rubygems.org/
13 13
   specs:
14 14
     ace-rails-ap (2.0.1)
15
-    actionmailer (4.1.4)
16
-      actionpack (= 4.1.4)
17
-      actionview (= 4.1.4)
15
+    actionmailer (4.1.5)
16
+      actionpack (= 4.1.5)
17
+      actionview (= 4.1.5)
18 18
       mail (~> 2.5.4)
19
-    actionpack (4.1.4)
20
-      actionview (= 4.1.4)
21
-      activesupport (= 4.1.4)
19
+    actionpack (4.1.5)
20
+      actionview (= 4.1.5)
21
+      activesupport (= 4.1.5)
22 22
       rack (~> 1.5.2)
23 23
       rack-test (~> 0.6.2)
24
-    actionview (4.1.4)
25
-      activesupport (= 4.1.4)
24
+    actionview (4.1.5)
25
+      activesupport (= 4.1.5)
26 26
       builder (~> 3.1)
27 27
       erubis (~> 2.7.0)
28
-    activemodel (4.1.4)
29
-      activesupport (= 4.1.4)
28
+    activemodel (4.1.5)
29
+      activesupport (= 4.1.5)
30 30
       builder (~> 3.1)
31
-    activerecord (4.1.4)
32
-      activemodel (= 4.1.4)
33
-      activesupport (= 4.1.4)
31
+    activerecord (4.1.5)
32
+      activemodel (= 4.1.5)
33
+      activesupport (= 4.1.5)
34 34
       arel (~> 5.0.0)
35
-    activesupport (4.1.4)
35
+    activesupport (4.1.5)
36 36
       i18n (~> 0.6, >= 0.6.9)
37 37
       json (~> 1.7, >= 1.7.7)
38 38
       minitest (~> 5.1)
@@ -60,12 +60,12 @@ GEM
60 60
     coffee-rails (4.0.1)
61 61
       coffee-script (>= 2.2.0)
62 62
       railties (>= 4.0.0, < 5.0)
63
-    coffee-script (2.2.0)
63
+    coffee-script (2.3.0)
64 64
       coffee-script-source
65 65
       execjs
66
-    coffee-script-source (1.7.0)
66
+    coffee-script-source (1.7.1)
67 67
     cookiejar (0.3.2)
68
-    coveralls (0.7.0)
68
+    coveralls (0.7.1)
69 69
       multi_json (~> 1.3)
70 70
       rest-client
71 71
       simplecov (>= 0.7)
@@ -77,7 +77,7 @@ GEM
77 77
     debug_inspector (0.0.2)
78 78
     delayed_job (4.0.2)
79 79
       activesupport (>= 3.0, < 4.2)
80
-    delayed_job_active_record (4.0.1)
80
+    delayed_job_active_record (4.0.2)
81 81
       activerecord (>= 3.0, < 4.2)
82 82
       delayed_job (>= 3.0, < 4.1)
83 83
     delorean (2.1.0)
@@ -154,7 +154,7 @@ GEM
154 154
     httparty (0.13.1)
155 155
       json (~> 1.8)
156 156
       multi_xml (>= 0.5.2)
157
-    i18n (0.6.9)
157
+    i18n (0.6.11)
158 158
     jquery-rails (3.1.1)
159 159
       railties (>= 3.0, < 5.0)
160 160
       thor (>= 0.14, < 2.0)
@@ -181,7 +181,7 @@ GEM
181 181
     method_source (0.8.2)
182 182
     mime-types (1.25.1)
183 183
     mini_portile (0.6.0)
184
-    minitest (5.3.5)
184
+    minitest (5.4.0)
185 185
     mqtt (0.2.0)
186 186
     multi_json (1.10.1)
187 187
     multi_xml (0.5.5)
@@ -189,7 +189,7 @@ GEM
189 189
     mysql2 (0.3.16)
190 190
     naught (1.0.0)
191 191
     net-ftp-list (3.2.8)
192
-    nokogiri (1.6.2.1)
192
+    nokogiri (1.6.3.1)
193 193
       mini_portile (= 0.6.0)
194 194
     oauth2 (0.9.4)
195 195
       faraday (>= 0.8, < 0.10)
@@ -202,7 +202,7 @@ GEM
202 202
     polyglot (0.3.5)
203 203
     protected_attributes (1.0.8)
204 204
       activemodel (>= 4.0.1, < 5.0)
205
-    pry (0.10.0)
205
+    pry (0.10.1)
206 206
       coderay (~> 1.1.0)
207 207
       method_source (~> 0.8.1)
208 208
       slop (~> 3.4)
@@ -211,31 +211,34 @@ GEM
211 211
     rack (1.5.2)
212 212
     rack-test (0.6.2)
213 213
       rack (>= 1.0)
214
-    rails (4.1.4)
215
-      actionmailer (= 4.1.4)
216
-      actionpack (= 4.1.4)
217
-      actionview (= 4.1.4)
218
-      activemodel (= 4.1.4)
219
-      activerecord (= 4.1.4)
220
-      activesupport (= 4.1.4)
214
+    rails (4.1.5)
215
+      actionmailer (= 4.1.5)
216
+      actionpack (= 4.1.5)
217
+      actionview (= 4.1.5)
218
+      activemodel (= 4.1.5)
219
+      activerecord (= 4.1.5)
220
+      activesupport (= 4.1.5)
221 221
       bundler (>= 1.3.0, < 2.0)
222
-      railties (= 4.1.4)
222
+      railties (= 4.1.5)
223 223
       sprockets-rails (~> 2.0)
224 224
     rails_12factor (0.0.2)
225 225
       rails_serve_static_assets
226 226
       rails_stdout_logging
227 227
     rails_serve_static_assets (0.0.2)
228 228
     rails_stdout_logging (0.0.3)
229
-    railties (4.1.4)
230
-      actionpack (= 4.1.4)
231
-      activesupport (= 4.1.4)
229
+    railties (4.1.5)
230
+      actionpack (= 4.1.5)
231
+      activesupport (= 4.1.5)
232 232
       rake (>= 0.8.7)
233 233
       thor (>= 0.18.1, < 2.0)
234 234
     raindrops (0.13.0)
235 235
     rake (10.3.2)
236
+    rdoc (4.1.1)
237
+      json (~> 1.4)
236 238
     ref (1.0.5)
237
-    rest-client (1.6.7)
238
-      mime-types (>= 1.16)
239
+    rest-client (1.6.8)
240
+      mime-types (~> 1.16)
241
+      rdoc (>= 2.4.2)
239 242
     retriable (1.4.1)
240 243
     rr (1.1.2)
241 244
     rspec (2.99.0)
@@ -244,7 +247,7 @@ GEM
244 247
       rspec-mocks (~> 2.99.0)
245 248
     rspec-collection_matchers (1.0.0)
246 249
       rspec-expectations (>= 2.99.0.beta1)
247
-    rspec-core (2.99.1)
250
+    rspec-core (2.99.2)
248 251
     rspec-expectations (2.99.2)
249 252
       diff-lcs (>= 1.1.3, < 2.0)
250 253
     rspec-mocks (2.99.2)
@@ -272,9 +275,9 @@ GEM
272 275
       sass (~> 3.2.0)
273 276
       sprockets (~> 2.8, <= 2.11.0)
274 277
       sprockets-rails (~> 2.0)
275
-    select2-rails (3.5.7)
278
+    select2-rails (3.5.9.1)
276 279
       thor (~> 0.14)
277
-    shoulda-matchers (2.6.1)
280
+    shoulda-matchers (2.6.2)
278 281
       activesupport (>= 3.0.0)
279 282
     signet (0.5.1)
280 283
       addressable (>= 2.2.3)
@@ -283,13 +286,13 @@ GEM
283 286
       multi_json (>= 1.0.0)
284 287
     simple-rss (1.3.1)
285 288
     simple_oauth (0.2.0)
286
-    simplecov (0.8.2)
289
+    simplecov (0.9.0)
287 290
       docile (~> 1.1.0)
288 291
       multi_json
289 292
       simplecov-html (~> 0.8.0)
290 293
     simplecov-html (0.8.0)
291 294
     slack-notifier (0.5.0)
292
-    slop (3.5.0)
295
+    slop (3.6.0)
293 296
     sprockets (2.11.0)
294 297
       hike (~> 1.2)
295 298
       multi_json (~> 1.0)
@@ -308,11 +311,11 @@ GEM
308 311
     thor (0.19.1)
309 312
     thread_safe (0.3.4)
310 313
     tilt (1.4.1)
311
-    tins (1.3.0)
314
+    tins (1.3.2)
312 315
     treetop (1.4.15)
313 316
       polyglot
314 317
       polyglot (>= 0.3.1)
315
-    twilio-ruby (3.11.5)
318
+    twilio-ruby (3.11.6)
316 319
       builder (>= 2.1.2)
317 320
       jwt (>= 0.1.2)
318 321
       multi_json (>= 1.3.0)
@@ -329,9 +332,9 @@ GEM
329 332
       simple_oauth (~> 0.2.0)
330 333
     typhoeus (0.6.9)
331 334
       ethon (>= 0.7.1)
332
-    tzinfo (1.2.1)
335
+    tzinfo (1.2.2)
333 336
       thread_safe (~> 0.1)
334
-    uglifier (2.5.1)
337
+    uglifier (2.5.3)
335 338
       execjs (>= 0.3.0)
336 339
       json (>= 1.8.0)
337 340
     unicorn (4.8.3)
@@ -340,7 +343,7 @@ GEM
340 343
       raindrops (~> 0.7)
341 344
     uuid (2.3.7)
342 345
       macaddr (~> 1.0)
343
-    uuidtools (2.1.4)
346
+    uuidtools (2.1.5)
344 347
     vcr (2.9.2)
345 348
     warden (1.2.3)
346 349
       rack (>= 1.0)
@@ -402,7 +405,7 @@ DEPENDENCIES
402 405
   pry
403 406
   quiet_assets
404 407
   rack
405
-  rails (= 4.1.4)
408
+  rails (= 4.1.5)
406 409
   rails_12factor
407 410
   rr
408 411
   rspec (~> 2.99)