Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #1 from andrew/master

Updated rails to 3.0.9 and split to 0.2.2
  • Loading branch information...
commit 985d65813871c9c2ea613bfee22c883ef9be9745 2 parents ffa3402 + e204555
Jeffrey Chupp authored June 19, 2011

Showing 2 changed files with 41 additions and 39 deletions. Show diff stats Hide diff stats

  1. 4  Gemfile
  2. 76  Gemfile.lock
4  Gemfile
... ...
@@ -1,7 +1,7 @@
1 1
 source 'http://rubygems.org'
2 2
 
3  
-gem 'rails', '3.0.7'
  3
+gem 'rails', '~> 3.0.9'
4 4
 
5 5
 gem 'sqlite3'
6 6
 
7  
-gem 'split'
  7
+gem 'split', '~> 0.2.2'
76  Gemfile.lock
@@ -2,12 +2,12 @@ GEM
2 2
   remote: http://rubygems.org/
3 3
   specs:
4 4
     abstract (1.0.0)
5  
-    actionmailer (3.0.7)
6  
-      actionpack (= 3.0.7)
7  
-      mail (~> 2.2.15)
8  
-    actionpack (3.0.7)
9  
-      activemodel (= 3.0.7)
10  
-      activesupport (= 3.0.7)
  5
+    actionmailer (3.0.9)
  6
+      actionpack (= 3.0.9)
  7
+      mail (~> 2.2.19)
  8
+    actionpack (3.0.9)
  9
+      activemodel (= 3.0.9)
  10
+      activesupport (= 3.0.9)
11 11
       builder (~> 2.1.2)
12 12
       erubis (~> 2.6.6)
13 13
       i18n (~> 0.5.0)
@@ -15,20 +15,20 @@ GEM
15 15
       rack-mount (~> 0.6.14)
16 16
       rack-test (~> 0.5.7)
17 17
       tzinfo (~> 0.3.23)
18  
-    activemodel (3.0.7)
19  
-      activesupport (= 3.0.7)
  18
+    activemodel (3.0.9)
  19
+      activesupport (= 3.0.9)
20 20
       builder (~> 2.1.2)
21 21
       i18n (~> 0.5.0)
22  
-    activerecord (3.0.7)
23  
-      activemodel (= 3.0.7)
24  
-      activesupport (= 3.0.7)
25  
-      arel (~> 2.0.2)
  22
+    activerecord (3.0.9)
  23
+      activemodel (= 3.0.9)
  24
+      activesupport (= 3.0.9)
  25
+      arel (~> 2.0.10)
26 26
       tzinfo (~> 0.3.23)
27  
-    activeresource (3.0.7)
28  
-      activemodel (= 3.0.7)
29  
-      activesupport (= 3.0.7)
30  
-    activesupport (3.0.7)
31  
-    arel (2.0.9)
  27
+    activeresource (3.0.9)
  28
+      activemodel (= 3.0.9)
  29
+      activesupport (= 3.0.9)
  30
+    activesupport (3.0.9)
  31
+    arel (2.0.10)
32 32
     builder (2.1.2)
33 33
     erubis (2.6.6)
34 34
       abstract (>= 1.0.0)
@@ -40,46 +40,48 @@ GEM
40 40
       treetop (~> 1.4.8)
41 41
     mime-types (1.16)
42 42
     polyglot (0.3.1)
43  
-    rack (1.2.2)
  43
+    rack (1.2.3)
44 44
     rack-mount (0.6.14)
45 45
       rack (>= 1.0.0)
46 46
     rack-test (0.5.7)
47 47
       rack (>= 1.0)
48  
-    rails (3.0.7)
49  
-      actionmailer (= 3.0.7)
50  
-      actionpack (= 3.0.7)
51  
-      activerecord (= 3.0.7)
52  
-      activeresource (= 3.0.7)
53  
-      activesupport (= 3.0.7)
  48
+    rails (3.0.9)
  49
+      actionmailer (= 3.0.9)
  50
+      actionpack (= 3.0.9)
  51
+      activerecord (= 3.0.9)
  52
+      activeresource (= 3.0.9)
  53
+      activesupport (= 3.0.9)
54 54
       bundler (~> 1.0)
55  
-      railties (= 3.0.7)
56  
-    railties (3.0.7)
57  
-      actionpack (= 3.0.7)
58  
-      activesupport (= 3.0.7)
  55
+      railties (= 3.0.9)
  56
+    railties (3.0.9)
  57
+      actionpack (= 3.0.9)
  58
+      activesupport (= 3.0.9)
59 59
       rake (>= 0.8.7)
  60
+      rdoc (~> 3.4)
60 61
       thor (~> 0.14.4)
61  
-    rake (0.8.7)
62  
-    redis (2.2.0)
63  
-    redis-namespace (0.10.0)
  62
+    rake (0.9.2)
  63
+    rdoc (3.6.1)
  64
+    redis (2.2.1)
  65
+    redis-namespace (1.0.3)
64 66
       redis (< 3.0.0)
65 67
     sinatra (1.2.6)
66 68
       rack (~> 1.1)
67  
-      tilt (< 2.0, >= 1.2.2)
68  
-    split (0.2.1)
  69
+      tilt (>= 1.2.2, < 2.0)
  70
+    split (0.2.2)
69 71
       redis (~> 2.1)
70  
-      redis-namespace (~> 0.10.0)
  72
+      redis-namespace (~> 1.0.3)
71 73
       sinatra (~> 1.2.6)
72 74
     sqlite3 (1.3.3)
73 75
     thor (0.14.6)
74 76
     tilt (1.3.2)
75 77
     treetop (1.4.9)
76 78
       polyglot (>= 0.3.1)
77  
-    tzinfo (0.3.27)
  79
+    tzinfo (0.3.28)
78 80
 
79 81
 PLATFORMS
80 82
   ruby
81 83
 
82 84
 DEPENDENCIES
83  
-  rails (= 3.0.7)
84  
-  split
  85
+  rails (~> 3.0.9)
  86
+  split (~> 0.2.2)
85 87
   sqlite3

0 notes on commit 985d658

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