Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Upgrade rails to 3.2.13 for security patches

* upgrade shoulda-matchers to work with this version of rails

https://trello.com/c/dmWF5VDI
  • Loading branch information...
commit 90714cf2dedcb463126e60ea8dc90f8bfcd1bb7b 1 parent afd9456
Greg Lazarev authored April 01, 2013
4  Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
2 2
 
3 3
 ruby '2.0.0'
4 4
 
5  
-gem 'rails', '~> 3.2'
  5
+gem 'rails', '>= 3.2.13'
6 6
 
7 7
 gem 'airbrake', '~> 3.1'
8 8
 gem 'attr_encrypted'
@@ -50,7 +50,7 @@ group :test do
50 50
   gem 'factory_girl_rails', '~> 3.0'
51 51
   gem 'jasmine'
52 52
   gem 'launchy'
53  
-  gem 'shoulda-matchers', '~> 1.4'
  53
+  gem 'shoulda-matchers', '1.5.2'
54 54
   gem 'simplecov', require: false
55 55
   gem 'sinatra'
56 56
   gem 'timecop'
82  Gemfile.lock
... ...
@@ -1,12 +1,12 @@
1 1
 GEM
2 2
   remote: https://rubygems.org/
3 3
   specs:
4  
-    actionmailer (3.2.12)
5  
-      actionpack (= 3.2.12)
6  
-      mail (~> 2.4.4)
7  
-    actionpack (3.2.12)
8  
-      activemodel (= 3.2.12)
9  
-      activesupport (= 3.2.12)
  4
+    actionmailer (3.2.13)
  5
+      actionpack (= 3.2.13)
  6
+      mail (~> 2.5.3)
  7
+    actionpack (3.2.13)
  8
+      activemodel (= 3.2.13)
  9
+      activesupport (= 3.2.13)
10 10
       builder (~> 3.0.0)
11 11
       erubis (~> 2.7.0)
12 12
       journey (~> 1.0.4)
@@ -14,19 +14,19 @@ GEM
14 14
       rack-cache (~> 1.2)
15 15
       rack-test (~> 0.6.1)
16 16
       sprockets (~> 2.2.1)
17  
-    activemodel (3.2.12)
18  
-      activesupport (= 3.2.12)
  17
+    activemodel (3.2.13)
  18
+      activesupport (= 3.2.13)
19 19
       builder (~> 3.0.0)
20  
-    activerecord (3.2.12)
21  
-      activemodel (= 3.2.12)
22  
-      activesupport (= 3.2.12)
  20
+    activerecord (3.2.13)
  21
+      activemodel (= 3.2.13)
  22
+      activesupport (= 3.2.13)
23 23
       arel (~> 3.0.2)
24 24
       tzinfo (~> 0.3.29)
25  
-    activeresource (3.2.12)
26  
-      activemodel (= 3.2.12)
27  
-      activesupport (= 3.2.12)
28  
-    activesupport (3.2.12)
29  
-      i18n (~> 0.6)
  25
+    activeresource (3.2.13)
  26
+      activemodel (= 3.2.13)
  27
+      activesupport (= 3.2.13)
  28
+    activesupport (3.2.13)
  29
+      i18n (= 0.6.1)
30 30
       multi_json (~> 1.0)
31 31
     addressable (2.3.3)
32 32
     airbrake (3.1.8)
@@ -50,8 +50,8 @@ GEM
50 50
     bourbon (2.1.3)
51 51
       sass (>= 3.2)
52 52
       thor
53  
-    bourne (1.1.2)
54  
-      mocha (= 0.10.5)
  53
+    bourne (1.4.0)
  54
+      mocha (~> 0.13.2)
55 55
     builder (3.0.4)
56 56
     capybara (2.0.2)
57 57
       mime-types (>= 1.16)
@@ -153,7 +153,7 @@ GEM
153 153
       addressable (~> 2.3)
154 154
     listen (0.7.3)
155 155
     lumberjack (1.0.3)
156  
-    mail (2.4.4)
  156
+    mail (2.5.3)
157 157
       i18n (>= 0.4.0)
158 158
       mime-types (~> 1.16)
159 159
       treetop (~> 1.4.8)
@@ -161,10 +161,10 @@ GEM
161 161
       tilt
162 162
     metaclass (0.0.1)
163 163
     method_source (0.8.1)
164  
-    mime-types (1.21)
165  
-    mocha (0.10.5)
  164
+    mime-types (1.22)
  165
+    mocha (0.13.3)
166 166
       metaclass (~> 0.0.1)
167  
-    multi_json (1.6.1)
  167
+    multi_json (1.7.2)
168 168
     multi_xml (0.5.3)
169 169
     multipart-post (1.1.5)
170 170
     newrelic_rpm (3.5.6.55)
@@ -204,23 +204,23 @@ GEM
204 204
       rack
205 205
     rack-test (0.6.2)
206 206
       rack (>= 1.0)
207  
-    rails (3.2.12)
208  
-      actionmailer (= 3.2.12)
209  
-      actionpack (= 3.2.12)
210  
-      activerecord (= 3.2.12)
211  
-      activeresource (= 3.2.12)
212  
-      activesupport (= 3.2.12)
  207
+    rails (3.2.13)
  208
+      actionmailer (= 3.2.13)
  209
+      actionpack (= 3.2.13)
  210
+      activerecord (= 3.2.13)
  211
+      activeresource (= 3.2.13)
  212
+      activesupport (= 3.2.13)
213 213
       bundler (~> 1.0)
214  
-      railties (= 3.2.12)
215  
-    railties (3.2.12)
216  
-      actionpack (= 3.2.12)
217  
-      activesupport (= 3.2.12)
  214
+      railties (= 3.2.13)
  215
+    railties (3.2.13)
  216
+      actionpack (= 3.2.13)
  217
+      activesupport (= 3.2.13)
218 218
       rack-ssl (~> 1.3.2)
219 219
       rake (>= 0.8.7)
220 220
       rdoc (~> 3.4)
221 221
       thor (>= 0.14.6, < 2.0)
222  
-    rake (10.0.3)
223  
-    rdoc (3.12.1)
  222
+    rake (10.0.4)
  223
+    rdoc (3.12.2)
224 224
       json (~> 1.4)
225 225
     rspec (2.12.0)
226 226
       rspec-core (~> 2.12.0)
@@ -250,9 +250,9 @@ GEM
250 250
       websocket (~> 1.0.4)
251 251
     sham_rack (1.3.4)
252 252
       rack
253  
-    shoulda-matchers (1.4.2)
  253
+    shoulda-matchers (1.5.2)
254 254
       activesupport (>= 3.0.0)
255  
-      bourne (~> 1.1.2)
  255
+      bourne (~> 1.3)
256 256
     simplecov (0.7.1)
257 257
       multi_json (~> 1.0)
258 258
       simplecov-html (~> 0.7.1)
@@ -290,8 +290,8 @@ GEM
290 290
       daemons (>= 1.0.9)
291 291
       eventmachine (>= 0.12.6)
292 292
       rack (>= 1.0.0)
293  
-    thor (0.17.0)
294  
-    tilt (1.3.3)
  293
+    thor (0.18.1)
  294
+    tilt (1.3.6)
295 295
     timecop (0.5.9.2)
296 296
     treetop (1.4.12)
297 297
       polyglot
@@ -299,7 +299,7 @@ GEM
299 299
     turnip (1.0.0)
300 300
       gherkin (>= 2.5)
301 301
       rspec (~> 2.0)
302  
-    tzinfo (0.3.35)
  302
+    tzinfo (0.3.37)
303 303
     uglifier (1.3.0)
304 304
       execjs (>= 0.3.0)
305 305
       multi_json (~> 1.0, >= 1.0.2)
@@ -357,12 +357,12 @@ DEPENDENCIES
357 357
   pg
358 358
   pry
359 359
   quiet_assets
360  
-  rails (~> 3.2)
  360
+  rails (>= 3.2.13)
361 361
   rspec-rails
362 362
   sass
363 363
   sass-rails (~> 3.2)
364 364
   sham_rack
365  
-  shoulda-matchers (~> 1.4)
  365
+  shoulda-matchers (= 1.5.2)
366 366
   simplecov
367 367
   sinatra
368 368
   sprockets-redirect
4  spec/models/event_spec.rb
@@ -45,7 +45,7 @@
45 45
   end
46 46
 end
47 47
 
48  
-describe Event, 'validations'do
  48
+describe Event, 'validations' do
49 49
   it { expect(subject).to validate_presence_of(:name).with_message(/field is required/) }
50 50
   it { expect(subject).to ensure_length_of(:name).is_at_most(Event::NAME_MAX_LENGTH) }
51 51
   it { expect(subject).to validate_presence_of(:user_id) }
@@ -58,7 +58,7 @@
58 58
   end
59 59
 end
60 60
 
61  
-describe Event, 'add_errors_if_no_suggestions'do
  61
+describe Event, 'add_errors_if_no_suggestions' do
62 62
   it 'adds errors if there are no primary suggestions' do
63 63
     event = create(:event)
64 64
     event.suggestions.map(&:mark_for_destruction)

0 notes on commit 90714cf

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