Skip to content
This repository
Browse code

Merge branch 'hotfix/0.0.3.4'

  • Loading branch information...
commit ae0acf2975ac04bb74d4c280eda83b9063865370 2 parents 2ca35fb + 1a995aa
Jonne Haß authored March 18, 2013
4  Changelog.md
Source Rendered
... ...
@@ -1,3 +1,7 @@
  1
+# 0.0.3.4
  2
+
  3
+* Bump Rails to 3.2.13, fixes CVE-2013-1854, CVE-2013-1855, CVE-2013-1856 and CVE-2013-1857. [Read more](http://weblog.rubyonrails.org/2013/3/18/SEC-ANN-Rails-3-2-13-3-1-12-and-2-3-18-have-been-released/)
  4
+
1 5
 # 0.0.3.3
2 6
 
3 7
 * Switch Gemfile source to https to be compatible with bundler 1.3
2  Gemfile
... ...
@@ -1,6 +1,6 @@
1 1
 source 'https://rubygems.org'
2 2
 
3  
-gem 'rails', '3.2.12'
  3
+gem 'rails', '3.2.13'
4 4
 
5 5
 gem 'foreman', '0.61'
6 6
 
64  Gemfile.lock
@@ -10,12 +10,12 @@ GIT
10 10
 GEM
11 11
   remote: https://rubygems.org/
12 12
   specs:
13  
-    actionmailer (3.2.12)
14  
-      actionpack (= 3.2.12)
15  
-      mail (~> 2.4.4)
16  
-    actionpack (3.2.12)
17  
-      activemodel (= 3.2.12)
18  
-      activesupport (= 3.2.12)
  13
+    actionmailer (3.2.13)
  14
+      actionpack (= 3.2.13)
  15
+      mail (~> 2.5.3)
  16
+    actionpack (3.2.13)
  17
+      activemodel (= 3.2.13)
  18
+      activesupport (= 3.2.13)
19 19
       builder (~> 3.0.0)
20 20
       erubis (~> 2.7.0)
21 21
       journey (~> 1.0.4)
@@ -23,21 +23,21 @@ GEM
23 23
       rack-cache (~> 1.2)
24 24
       rack-test (~> 0.6.1)
25 25
       sprockets (~> 2.2.1)
26  
-    activemodel (3.2.12)
27  
-      activesupport (= 3.2.12)
  26
+    activemodel (3.2.13)
  27
+      activesupport (= 3.2.13)
28 28
       builder (~> 3.0.0)
29  
-    activerecord (3.2.12)
30  
-      activemodel (= 3.2.12)
31  
-      activesupport (= 3.2.12)
  29
+    activerecord (3.2.13)
  30
+      activemodel (= 3.2.13)
  31
+      activesupport (= 3.2.13)
32 32
       arel (~> 3.0.2)
33 33
       tzinfo (~> 0.3.29)
34 34
     activerecord-import (0.3.1)
35 35
       activerecord (~> 3.0)
36  
-    activeresource (3.2.12)
37  
-      activemodel (= 3.2.12)
38  
-      activesupport (= 3.2.12)
39  
-    activesupport (3.2.12)
40  
-      i18n (~> 0.6)
  36
+    activeresource (3.2.13)
  37
+      activemodel (= 3.2.13)
  38
+      activesupport (= 3.2.13)
  39
+    activesupport (3.2.13)
  40
+      i18n (= 0.6.1)
41 41
       multi_json (~> 1.0)
42 42
     acts-as-taggable-on (2.3.3)
43 43
       rails (~> 3.0)
@@ -200,7 +200,7 @@ GEM
200 200
     kgio (2.8.0)
201 201
     listen (0.7.2)
202 202
     lumberjack (1.0.2)
203  
-    mail (2.4.4)
  203
+    mail (2.5.3)
204 204
       i18n (>= 0.4.0)
205 205
       mime-types (~> 1.16)
206 206
       treetop (~> 1.4.8)
@@ -214,7 +214,7 @@ GEM
214 214
     mobile-fu (1.1.1)
215 215
       rack-mobile-detect
216 216
       rails
217  
-    multi_json (1.6.1)
  217
+    multi_json (1.7.1)
218 218
     multipart-post (1.1.5)
219 219
     mysql2 (0.3.11)
220 220
     nested_form (0.3.1)
@@ -274,14 +274,14 @@ GEM
274 274
       rack
275 275
     rack-test (0.6.2)
276 276
       rack (>= 1.0)
277  
-    rails (3.2.12)
278  
-      actionmailer (= 3.2.12)
279  
-      actionpack (= 3.2.12)
280  
-      activerecord (= 3.2.12)
281  
-      activeresource (= 3.2.12)
282  
-      activesupport (= 3.2.12)
  277
+    rails (3.2.13)
  278
+      actionmailer (= 3.2.13)
  279
+      actionpack (= 3.2.13)
  280
+      activerecord (= 3.2.13)
  281
+      activeresource (= 3.2.13)
  282
+      activesupport (= 3.2.13)
283 283
       bundler (~> 1.0)
284  
-      railties (= 3.2.12)
  284
+      railties (= 3.2.13)
285 285
     rails-i18n (0.7.2)
286 286
       i18n (~> 0.5)
287 287
     rails_admin (0.4.5)
@@ -301,9 +301,9 @@ GEM
301 301
       sass-rails (~> 3.1)
302 302
     rails_autolink (1.0.9)
303 303
       rails (~> 3.1)
304  
-    railties (3.2.12)
305  
-      actionpack (= 3.2.12)
306  
-      activesupport (= 3.2.12)
  304
+    railties (3.2.13)
  305
+      actionpack (= 3.2.13)
  306
+      activesupport (= 3.2.13)
307 307
       rack-ssl (~> 1.3.2)
308 308
       rake (>= 0.8.7)
309 309
       rdoc (~> 3.4)
@@ -313,7 +313,7 @@ GEM
313 313
     rb-fsevent (0.9.3)
314 314
     rb-inotify (0.9.0)
315 315
       ffi (>= 0.5.0)
316  
-    rdoc (3.12.1)
  316
+    rdoc (3.12.2)
317 317
       json (~> 1.4)
318 318
     redcarpet (2.2.2)
319 319
     redis (3.0.2)
@@ -374,7 +374,7 @@ GEM
374 374
     subexec (0.2.2)
375 375
     terminal-table (1.4.5)
376 376
     thor (0.17.0)
377  
-    tilt (1.3.3)
  377
+    tilt (1.3.6)
378 378
     timecop (0.5.9.2)
379 379
     treetop (1.4.12)
380 380
       polyglot
@@ -385,7 +385,7 @@ GEM
385 385
       simple_oauth (~> 0.2)
386 386
     typhoeus (0.3.3)
387 387
       mime-types
388  
-    tzinfo (0.3.35)
  388
+    tzinfo (0.3.37)
389 389
     uglifier (1.3.0)
390 390
       execjs (>= 0.3.0)
391 391
       multi_json (~> 1.0, >= 1.0.2)
@@ -459,7 +459,7 @@ DEPENDENCIES
459 459
   rack-protection (= 1.2)
460 460
   rack-rewrite (= 1.3.3)
461 461
   rack-ssl (= 1.3.3)
462  
-  rails (= 3.2.12)
  462
+  rails (= 3.2.13)
463 463
   rails-i18n (= 0.7.2)
464 464
   rails_admin (= 0.4.5)
465 465
   rails_autolink (= 1.0.9)
2  config/defaults.yml
@@ -4,7 +4,7 @@
4 4
 
5 5
 defaults:
6 6
   version:
7  
-    number: "0.0.3.3"
  7
+    number: "0.0.3.4"
8 8
   heroku: false
9 9
   environment:
10 10
     url: "http://localhost:3000/"

0 notes on commit ae0acf2

Please sign in to comment.
Something went wrong with that request. Please try again.