Skip to content
This repository
Browse code

Update Gemfile.locks to latest patch releases of Rails and fix mocha …

…to 0.10.0.t
  • Loading branch information...
commit 4b0d161f95c994b6b5666154a7131e25aaa17f45 1 parent b2b8b5b
Lucas Mazza authored
58  Gemfile.lock
... ...
@@ -1,7 +1,7 @@
1 1
 PATH
2 2
   remote: .
3 3
   specs:
4  
-    devise (2.2.0.rc)
  4
+    devise (2.2.0)
5 5
       bcrypt-ruby (~> 3.0)
6 6
       orm_adapter (~> 0.1)
7 7
       railties (~> 3.1)
@@ -10,12 +10,12 @@ PATH
10 10
 GEM
11 11
   remote: http://rubygems.org/
12 12
   specs:
13  
-    actionmailer (3.2.9)
14  
-      actionpack (= 3.2.9)
  13
+    actionmailer (3.2.11)
  14
+      actionpack (= 3.2.11)
15 15
       mail (~> 2.4.4)
16  
-    actionpack (3.2.9)
17  
-      activemodel (= 3.2.9)
18  
-      activesupport (= 3.2.9)
  16
+    actionpack (3.2.11)
  17
+      activemodel (= 3.2.11)
  18
+      activesupport (= 3.2.11)
19 19
       builder (~> 3.0.0)
20 20
       erubis (~> 2.7.0)
21 21
       journey (~> 1.0.4)
@@ -23,18 +23,18 @@ GEM
23 23
       rack-cache (~> 1.2)
24 24
       rack-test (~> 0.6.1)
25 25
       sprockets (~> 2.2.1)
26  
-    activemodel (3.2.9)
27  
-      activesupport (= 3.2.9)
  26
+    activemodel (3.2.11)
  27
+      activesupport (= 3.2.11)
28 28
       builder (~> 3.0.0)
29  
-    activerecord (3.2.9)
30  
-      activemodel (= 3.2.9)
31  
-      activesupport (= 3.2.9)
  29
+    activerecord (3.2.11)
  30
+      activemodel (= 3.2.11)
  31
+      activesupport (= 3.2.11)
32 32
       arel (~> 3.0.2)
33 33
       tzinfo (~> 0.3.29)
34  
-    activeresource (3.2.9)
35  
-      activemodel (= 3.2.9)
36  
-      activesupport (= 3.2.9)
37  
-    activesupport (3.2.9)
  34
+    activeresource (3.2.11)
  35
+      activemodel (= 3.2.11)
  36
+      activesupport (= 3.2.11)
  37
+    activesupport (3.2.11)
38 38
       i18n (~> 0.6)
39 39
       multi_json (~> 1.0)
40 40
     arel (3.0.2)
@@ -48,7 +48,7 @@ GEM
48 48
     httpauth (0.2.0)
49 49
     i18n (0.6.1)
50 50
     journey (1.0.4)
51  
-    json (1.7.5)
  51
+    json (1.7.6)
52 52
     jwt (0.1.5)
53 53
       multi_json (>= 1.0)
54 54
     mail (2.4.4)
@@ -65,7 +65,7 @@ GEM
65 65
       origin (~> 1.0)
66 66
       tzinfo (~> 0.3.22)
67 67
     moped (1.3.1)
68  
-    multi_json (1.4.0)
  68
+    multi_json (1.5.0)
69 69
     multipart-post (1.1.5)
70 70
     nokogiri (1.5.5)
71 71
     oauth2 (0.8.0)
@@ -88,7 +88,7 @@ GEM
88 88
     origin (1.0.11)
89 89
     orm_adapter (0.4.0)
90 90
     polyglot (0.3.3)
91  
-    rack (1.4.1)
  91
+    rack (1.4.3)
92 92
     rack-cache (1.2)
93 93
       rack (>= 0.4)
94 94
     rack-openid (1.3.1)
@@ -98,22 +98,22 @@ GEM
98 98
       rack
99 99
     rack-test (0.6.2)
100 100
       rack (>= 1.0)
101  
-    rails (3.2.9)
102  
-      actionmailer (= 3.2.9)
103  
-      actionpack (= 3.2.9)
104  
-      activerecord (= 3.2.9)
105  
-      activeresource (= 3.2.9)
106  
-      activesupport (= 3.2.9)
  101
+    rails (3.2.11)
  102
+      actionmailer (= 3.2.11)
  103
+      actionpack (= 3.2.11)
  104
+      activerecord (= 3.2.11)
  105
+      activeresource (= 3.2.11)
  106
+      activesupport (= 3.2.11)
107 107
       bundler (~> 1.0)
108  
-      railties (= 3.2.9)
109  
-    railties (3.2.9)
110  
-      actionpack (= 3.2.9)
111  
-      activesupport (= 3.2.9)
  108
+      railties (= 3.2.11)
  109
+    railties (3.2.11)
  110
+      actionpack (= 3.2.11)
  111
+      activesupport (= 3.2.11)
112 112
       rack-ssl (~> 1.3.2)
113 113
       rake (>= 0.8.7)
114 114
       rdoc (~> 3.4)
115 115
       thor (>= 0.14.6, < 2.0)
116  
-    rake (10.0.2)
  116
+    rake (10.0.3)
117 117
     rdoc (3.12)
118 118
       json (~> 1.4)
119 119
     ruby-openid (2.2.2)
2  gemfiles/Gemfile.rails-3.1.x
@@ -11,7 +11,7 @@ group :test do
11 11
   gem "omniauth-facebook"
12 12
   gem "omniauth-openid", "~> 1.0.1"
13 13
   gem "webrat", "0.7.2", :require => false
14  
-  gem "mocha", :require => false
  14
+  gem "mocha", "0.10.0", :require => false
15 15
 
16 16
   platforms :mri_18 do
17 17
     gem "ruby-debug", ">= 0.10.3"
121  gemfiles/Gemfile.rails-3.1.x.lock
... ...
@@ -1,7 +1,7 @@
1 1
 PATH
2 2
   remote: ..
3 3
   specs:
4  
-    devise (2.1.2)
  4
+    devise (2.2.0)
5 5
       bcrypt-ruby (~> 3.0)
6 6
       orm_adapter (~> 0.1)
7 7
       railties (~> 3.1)
@@ -10,48 +10,48 @@ PATH
10 10
 GEM
11 11
   remote: http://rubygems.org/
12 12
   specs:
13  
-    actionmailer (3.1.4)
14  
-      actionpack (= 3.1.4)
15  
-      mail (~> 2.3.0)
16  
-    actionpack (3.1.4)
17  
-      activemodel (= 3.1.4)
18  
-      activesupport (= 3.1.4)
  13
+    actionmailer (3.1.10)
  14
+      actionpack (= 3.1.10)
  15
+      mail (~> 2.3.3)
  16
+    actionpack (3.1.10)
  17
+      activemodel (= 3.1.10)
  18
+      activesupport (= 3.1.10)
19 19
       builder (~> 3.0.0)
20 20
       erubis (~> 2.7.0)
21 21
       i18n (~> 0.6)
22 22
       rack (~> 1.3.6)
23  
-      rack-cache (~> 1.1)
  23
+      rack-cache (~> 1.2)
24 24
       rack-mount (~> 0.8.2)
25 25
       rack-test (~> 0.6.1)
26  
-      sprockets (~> 2.0.3)
27  
-    activemodel (3.1.4)
28  
-      activesupport (= 3.1.4)
  26
+      sprockets (~> 2.0.4)
  27
+    activemodel (3.1.10)
  28
+      activesupport (= 3.1.10)
29 29
       builder (~> 3.0.0)
30 30
       i18n (~> 0.6)
31  
-    activerecord (3.1.4)
32  
-      activemodel (= 3.1.4)
33  
-      activesupport (= 3.1.4)
  31
+    activerecord (3.1.10)
  32
+      activemodel (= 3.1.10)
  33
+      activesupport (= 3.1.10)
34 34
       arel (~> 2.2.3)
35 35
       tzinfo (~> 0.3.29)
36  
-    activeresource (3.1.4)
37  
-      activemodel (= 3.1.4)
38  
-      activesupport (= 3.1.4)
39  
-    activesupport (3.1.4)
40  
-      multi_json (~> 1.0)
41  
-    addressable (2.2.7)
  36
+    activeresource (3.1.10)
  37
+      activemodel (= 3.1.10)
  38
+      activesupport (= 3.1.10)
  39
+    activesupport (3.1.10)
  40
+      multi_json (>= 1.0, < 1.3)
42 41
     arel (2.2.3)
43 42
     bcrypt-ruby (3.0.1)
44  
-    builder (3.0.0)
  43
+    builder (3.0.4)
45 44
     columnize (0.3.6)
46 45
     erubis (2.7.0)
47  
-    faraday (0.7.6)
48  
-      addressable (~> 2.2)
  46
+    faraday (0.8.4)
49 47
       multipart-post (~> 1.1)
50  
-      rack (~> 1.1)
51 48
     hashie (1.2.0)
52 49
     hike (1.2.1)
53  
-    i18n (0.6.0)
54  
-    json (1.7.0)
  50
+    httpauth (0.2.0)
  51
+    i18n (0.6.1)
  52
+    json (1.7.6)
  53
+    jwt (0.1.5)
  54
+      multi_json (>= 1.0)
55 55
     linecache (0.46)
56 56
       rbx-require-relative (> 0.0.4)
57 57
     mail (2.3.3)
@@ -59,36 +59,39 @@ GEM
59 59
       mime-types (~> 1.16)
60 60
       treetop (~> 1.4.8)
61 61
     metaclass (0.0.1)
62  
-    mime-types (1.18)
63  
-    mocha (0.10.4)
  62
+    mime-types (1.19)
  63
+    mocha (0.10.0)
64 64
       metaclass (~> 0.0.1)
65  
-    mongoid (3.0.12)
  65
+    mongoid (3.0.16)
66 66
       activemodel (~> 3.1)
67 67
       moped (~> 1.1)
68 68
       origin (~> 1.0)
69 69
       tzinfo (~> 0.3.22)
70  
-    moped (1.2.9)
71  
-    multi_json (1.3.4)
  70
+    moped (1.3.2)
  71
+    multi_json (1.2.0)
72 72
     multipart-post (1.1.5)
73  
-    nokogiri (1.5.0)
74  
-    oauth2 (0.5.2)
75  
-      faraday (~> 0.7)
  73
+    nokogiri (1.5.6)
  74
+    oauth2 (0.8.0)
  75
+      faraday (~> 0.8)
  76
+      httpauth (~> 0.1)
  77
+      jwt (~> 0.1.4)
76 78
       multi_json (~> 1.0)
77  
-    omniauth (1.0.2)
  79
+      rack (~> 1.2)
  80
+    omniauth (1.0.3)
78 81
       hashie (~> 1.2)
79 82
       rack
80  
-    omniauth-facebook (1.2.0)
81  
-      omniauth-oauth2 (~> 1.0.0)
82  
-    omniauth-oauth2 (1.0.0)
83  
-      oauth2 (~> 0.5.0)
  83
+    omniauth-facebook (1.4.0)
  84
+      omniauth-oauth2 (~> 1.0.2)
  85
+    omniauth-oauth2 (1.0.3)
  86
+      oauth2 (~> 0.8.0)
84 87
       omniauth (~> 1.0)
85 88
     omniauth-openid (1.0.1)
86 89
       omniauth (~> 1.0)
87 90
       rack-openid (~> 1.3.1)
88  
-    origin (1.0.10)
  91
+    origin (1.0.11)
89 92
     orm_adapter (0.4.0)
90 93
     polyglot (0.3.3)
91  
-    rack (1.3.6)
  94
+    rack (1.3.8)
92 95
     rack-cache (1.2)
93 96
       rack (>= 0.4)
94 97
     rack-mount (0.8.3)
@@ -98,25 +101,25 @@ GEM
98 101
       ruby-openid (>= 2.1.8)
99 102
     rack-ssl (1.3.2)
100 103
       rack
101  
-    rack-test (0.6.1)
  104
+    rack-test (0.6.2)
102 105
       rack (>= 1.0)
103  
-    rails (3.1.4)
104  
-      actionmailer (= 3.1.4)
105  
-      actionpack (= 3.1.4)
106  
-      activerecord (= 3.1.4)
107  
-      activeresource (= 3.1.4)
108  
-      activesupport (= 3.1.4)
  106
+    rails (3.1.10)
  107
+      actionmailer (= 3.1.10)
  108
+      actionpack (= 3.1.10)
  109
+      activerecord (= 3.1.10)
  110
+      activeresource (= 3.1.10)
  111
+      activesupport (= 3.1.10)
109 112
       bundler (~> 1.0)
110  
-      railties (= 3.1.4)
111  
-    railties (3.1.4)
112  
-      actionpack (= 3.1.4)
113  
-      activesupport (= 3.1.4)
  113
+      railties (= 3.1.10)
  114
+    railties (3.1.10)
  115
+      actionpack (= 3.1.10)
  116
+      activesupport (= 3.1.10)
114 117
       rack-ssl (~> 1.3.2)
115 118
       rake (>= 0.8.7)
116 119
       rdoc (~> 3.4)
117 120
       thor (~> 0.14.6)
118  
-    rake (0.9.2.2)
119  
-    rbx-require-relative (0.0.5)
  121
+    rake (10.0.3)
  122
+    rbx-require-relative (0.0.9)
120 123
     rdoc (3.12)
121 124
       json (~> 1.4)
122 125
     ruby-debug (0.10.4)
@@ -124,18 +127,18 @@ GEM
124 127
       ruby-debug-base (~> 0.10.4.0)
125 128
     ruby-debug-base (0.10.4)
126 129
       linecache (>= 0.3)
127  
-    ruby-openid (2.1.8)
  130
+    ruby-openid (2.2.2)
128 131
     sprockets (2.0.4)
129 132
       hike (~> 1.2)
130 133
       rack (~> 1.0)
131 134
       tilt (~> 1.1, != 1.3.0)
132  
-    sqlite3 (1.3.5)
  135
+    sqlite3 (1.3.6)
133 136
     thor (0.14.6)
134 137
     tilt (1.3.3)
135  
-    treetop (1.4.10)
  138
+    treetop (1.4.12)
136 139
       polyglot
137 140
       polyglot (>= 0.3.1)
138  
-    tzinfo (0.3.33)
  141
+    tzinfo (0.3.35)
139 142
     warden (1.2.1)
140 143
       rack (>= 1.0)
141 144
     webrat (0.7.2)
@@ -151,7 +154,7 @@ DEPENDENCIES
151 154
   activerecord-jdbcsqlite3-adapter
152 155
   devise!
153 156
   jruby-openssl
154  
-  mocha
  157
+  mocha (= 0.10.0)
155 158
   mongoid (~> 3.0)
156 159
   omniauth (~> 1.0.0)
157 160
   omniauth-facebook

0 notes on commit 4b0d161

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