Upgrade rails to 4.2.1

Dominik Sander 9 years ago
parent
commit
192dcceaeb
2 changed files with 36 additions and 36 deletions
  1. 1 1
      Gemfile
  2. 35 35
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -76,7 +76,7 @@ gem 'mysql2', '~> 0.3.16'
76 76
 gem 'multi_xml'
77 77
 gem 'nokogiri', '~> 1.6.4'
78 78
 gem 'omniauth'
79
-gem 'rails' , '4.2.1rc2'
79
+gem 'rails' , '4.2.1'
80 80
 gem 'rufus-scheduler', '~> 3.0.8', require: false
81 81
 gem 'sass-rails',   '~> 5.0'
82 82
 gem 'select2-rails', '~> 3.5.4'

+ 35 - 35
Gemfile.lock

@@ -12,36 +12,36 @@ GEM
12 12
   remote: https://rubygems.org/
13 13
   specs:
14 14
     ace-rails-ap (2.0.1)
15
-    actionmailer (4.2.1.rc2)
16
-      actionpack (= 4.2.1.rc2)
17
-      actionview (= 4.2.1.rc2)
18
-      activejob (= 4.2.1.rc2)
15
+    actionmailer (4.2.1)
16
+      actionpack (= 4.2.1)
17
+      actionview (= 4.2.1)
18
+      activejob (= 4.2.1)
19 19
       mail (~> 2.5, >= 2.5.4)
20 20
       rails-dom-testing (~> 1.0, >= 1.0.5)
21
-    actionpack (4.2.1.rc2)
22
-      actionview (= 4.2.1.rc2)
23
-      activesupport (= 4.2.1.rc2)
21
+    actionpack (4.2.1)
22
+      actionview (= 4.2.1)
23
+      activesupport (= 4.2.1)
24 24
       rack (~> 1.6)
25 25
       rack-test (~> 0.6.2)
26 26
       rails-dom-testing (~> 1.0, >= 1.0.5)
27 27
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
28
-    actionview (4.2.1.rc2)
29
-      activesupport (= 4.2.1.rc2)
28
+    actionview (4.2.1)
29
+      activesupport (= 4.2.1)
30 30
       builder (~> 3.1)
31 31
       erubis (~> 2.7.0)
32 32
       rails-dom-testing (~> 1.0, >= 1.0.5)
33 33
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
34
-    activejob (4.2.1.rc2)
35
-      activesupport (= 4.2.1.rc2)
34
+    activejob (4.2.1)
35
+      activesupport (= 4.2.1)
36 36
       globalid (>= 0.3.0)
37
-    activemodel (4.2.1.rc2)
38
-      activesupport (= 4.2.1.rc2)
37
+    activemodel (4.2.1)
38
+      activesupport (= 4.2.1)
39 39
       builder (~> 3.1)
40
-    activerecord (4.2.1.rc2)
41
-      activemodel (= 4.2.1.rc2)
42
-      activesupport (= 4.2.1.rc2)
40
+    activerecord (4.2.1)
41
+      activemodel (= 4.2.1)
42
+      activesupport (= 4.2.1)
43 43
       arel (~> 6.0)
44
-    activesupport (4.2.1.rc2)
44
+    activesupport (4.2.1)
45 45
       i18n (~> 0.7)
46 46
       json (~> 1.7, >= 1.7.7)
47 47
       minitest (~> 5.1)
@@ -229,11 +229,11 @@ GEM
229 229
     memoizable (0.4.2)
230 230
       thread_safe (~> 0.3, >= 0.3.1)
231 231
     method_source (0.8.2)
232
-    mime-types (1.25.1)
232
+    mime-types (2.4.3)
233 233
     mini_portile (0.6.2)
234 234
     minitest (5.5.1)
235 235
     mqtt (0.3.1)
236
-    multi_json (1.10.1)
236
+    multi_json (1.11.0)
237 237
     multi_xml (0.5.5)
238 238
     multipart-post (2.0.0)
239 239
     mysql2 (0.3.16)
@@ -284,33 +284,33 @@ GEM
284 284
     rack (1.6.0)
285 285
     rack-test (0.6.3)
286 286
       rack (>= 1.0)
287
-    rails (4.2.1.rc2)
288
-      actionmailer (= 4.2.1.rc2)
289
-      actionpack (= 4.2.1.rc2)
290
-      actionview (= 4.2.1.rc2)
291
-      activejob (= 4.2.1.rc2)
292
-      activemodel (= 4.2.1.rc2)
293
-      activerecord (= 4.2.1.rc2)
294
-      activesupport (= 4.2.1.rc2)
287
+    rails (4.2.1)
288
+      actionmailer (= 4.2.1)
289
+      actionpack (= 4.2.1)
290
+      actionview (= 4.2.1)
291
+      activejob (= 4.2.1)
292
+      activemodel (= 4.2.1)
293
+      activerecord (= 4.2.1)
294
+      activesupport (= 4.2.1)
295 295
       bundler (>= 1.3.0, < 2.0)
296
-      railties (= 4.2.1.rc2)
296
+      railties (= 4.2.1)
297 297
       sprockets-rails
298 298
     rails-deprecated_sanitizer (1.0.3)
299 299
       activesupport (>= 4.2.0.alpha)
300
-    rails-dom-testing (1.0.5)
300
+    rails-dom-testing (1.0.6)
301 301
       activesupport (>= 4.2.0.beta, < 5.0)
302 302
       nokogiri (~> 1.6.0)
303 303
       rails-deprecated_sanitizer (>= 1.0.1)
304
-    rails-html-sanitizer (1.0.1)
304
+    rails-html-sanitizer (1.0.2)
305 305
       loofah (~> 2.0)
306 306
     rails_12factor (0.0.3)
307 307
       rails_serve_static_assets
308 308
       rails_stdout_logging
309 309
     rails_serve_static_assets (0.0.4)
310 310
     rails_stdout_logging (0.0.3)
311
-    railties (4.2.1.rc2)
312
-      actionpack (= 4.2.1.rc2)
313
-      activesupport (= 4.2.1.rc2)
311
+    railties (4.2.1)
312
+      actionpack (= 4.2.1)
313
+      activesupport (= 4.2.1)
314 314
       rake (>= 0.8.7)
315 315
       thor (>= 0.18.1, < 2.0)
316 316
     raindrops (0.13.0)
@@ -410,7 +410,7 @@ GEM
410 410
       libv8 (~> 3.16.14.0)
411 411
       ref
412 412
     thor (0.19.1)
413
-    thread_safe (0.3.4)
413
+    thread_safe (0.3.5)
414 414
     tilt (1.4.1)
415 415
     timers (4.0.1)
416 416
       hitimes
@@ -528,7 +528,7 @@ DEPENDENCIES
528 528
   pry
529 529
   quiet_assets
530 530
   rack
531
-  rails (= 4.2.1rc2)
531
+  rails (= 4.2.1)
532 532
   rails_12factor
533 533
   rr
534 534
   rspec (~> 3.2)