Download as
Browse Code »

Commit abc10614c67d5e45dc4df2fc387a2c57530230f3

Authored by Stephen Crosby
2 parents c7d93c8a 6820a890
Exists in master and in 1 other branch production

Merge pull request #723 from lucianosousa/rails-3.2.19 

update rails version. add security pack
Showing 2 changed files with 33 additions and 33 deletions   Show diff stats
Gemfile
  Diff comments   View file @abc1061
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 3.2.18'
  3 +RAILS_VERSION = '~> 3.2.19'
4 4  
5 5 gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
... ...
Gemfile.lock
  Diff comments   View file @abc1061
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.18)
5   - actionpack (= 3.2.18)
  4 + actionmailer (3.2.19)
  5 + actionpack (= 3.2.19)
6 6 mail (~> 2.5.4)
7 7 actionmailer_inline_css (1.5.3)
8 8 actionmailer (>= 3.0.0)
9 9 nokogiri (>= 1.4.4)
10 10 premailer (>= 1.7.1)
11   - actionpack (3.2.18)
12   - activemodel (= 3.2.18)
13   - activesupport (= 3.2.18)
  11 + actionpack (3.2.19)
  12 + activemodel (= 3.2.19)
  13 + activesupport (= 3.2.19)
14 14 builder (~> 3.0.0)
15 15 erubis (~> 2.7.0)
16 16 journey (~> 1.0.4)
... ... @@ -18,18 +18,18 @@ GEM
18 18 rack-cache (~> 1.2)
19 19 rack-test (~> 0.6.1)
20 20 sprockets (~> 2.2.1)
21   - activemodel (3.2.18)
22   - activesupport (= 3.2.18)
  21 + activemodel (3.2.19)
  22 + activesupport (= 3.2.19)
23 23 builder (~> 3.0.0)
24   - activerecord (3.2.18)
25   - activemodel (= 3.2.18)
26   - activesupport (= 3.2.18)
  24 + activerecord (3.2.19)
  25 + activemodel (= 3.2.19)
  26 + activesupport (= 3.2.19)
27 27 arel (~> 3.0.2)
28 28 tzinfo (~> 0.3.29)
29   - activeresource (3.2.18)
30   - activemodel (= 3.2.18)
31   - activesupport (= 3.2.18)
32   - activesupport (3.2.18)
  29 + activeresource (3.2.19)
  30 + activemodel (= 3.2.19)
  31 + activesupport (= 3.2.19)
  32 + activesupport (3.2.19)
33 33 i18n (~> 0.6, >= 0.6.4)
34 34 multi_json (~> 1.0)
35 35 addressable (2.3.5)
... ... @@ -126,7 +126,7 @@ GEM
126 126 json (~> 1.8)
127 127 multi_xml (>= 0.5.2)
128 128 httpauth (0.2.0)
129   - i18n (0.6.9)
  129 + i18n (0.6.11)
130 130 jira-ruby (0.1.2)
131 131 activesupport
132 132 oauth
... ... @@ -174,7 +174,7 @@ GEM
174 174 rails (>= 3.2.0)
175 175 railties (>= 3.2.0)
176 176 moped (1.5.1)
177   - multi_json (1.10.0)
  177 + multi_json (1.10.1)
178 178 multi_xml (0.5.5)
179 179 multipart-post (1.2.0)
180 180 net-scp (1.1.2)
... ... @@ -222,7 +222,7 @@ GEM
222 222 rest-client (~> 1.6.0)
223 223 pjax_rails (0.3.4)
224 224 jquery-rails
225   - polyglot (0.3.4)
  225 + polyglot (0.3.5)
226 226 premailer (1.7.3)
227 227 css_parser (>= 1.1.9)
228 228 htmlentities (>= 4.0.0)
... ... @@ -246,25 +246,25 @@ GEM
246 246 rack-ssl-enforcer (0.2.6)
247 247 rack-test (0.6.2)
248 248 rack (>= 1.0)
249   - rails (3.2.18)
250   - actionmailer (= 3.2.18)
251   - actionpack (= 3.2.18)
252   - activerecord (= 3.2.18)
253   - activeresource (= 3.2.18)
254   - activesupport (= 3.2.18)
  249 + rails (3.2.19)
  250 + actionmailer (= 3.2.19)
  251 + actionpack (= 3.2.19)
  252 + activerecord (= 3.2.19)
  253 + activeresource (= 3.2.19)
  254 + activesupport (= 3.2.19)
255 255 bundler (~> 1.0)
256   - railties (= 3.2.18)
  256 + railties (= 3.2.19)
257 257 rails_autolink (1.1.4)
258 258 rails (> 3.1)
259   - railties (3.2.18)
260   - actionpack (= 3.2.18)
261   - activesupport (= 3.2.18)
  259 + railties (3.2.19)
  260 + actionpack (= 3.2.19)
  261 + activesupport (= 3.2.19)
262 262 rack-ssl (~> 1.3.2)
263 263 rake (>= 0.8.7)
264 264 rdoc (~> 3.4)
265 265 thor (>= 0.14.6, < 2.0)
266 266 raindrops (0.12.0)
267   - rake (10.3.1)
  267 + rake (10.3.2)
268 268 rdoc (3.12.2)
269 269 json (~> 1.4)
270 270 ref (1.0.5)
... ... @@ -327,7 +327,7 @@ GEM
327 327 turbo-sprockets-rails3 (0.3.10)
328 328 railties (> 3.2.8, < 4.0.0)
329 329 sprockets (>= 2.0.0)
330   - tzinfo (0.3.39)
  330 + tzinfo (0.3.41)
331 331 uglifier (2.2.1)
332 332 execjs (>= 0.3.0)
333 333 multi_json (~> 1.0, >= 1.0.2)
... ... @@ -351,9 +351,9 @@ PLATFORMS
351 351 ruby
352 352  
353 353 DEPENDENCIES
354   - actionmailer (~> 3.2.18)
  354 + actionmailer (~> 3.2.19)
355 355 actionmailer_inline_css
356   - actionpack (~> 3.2.18)
  356 + actionpack (~> 3.2.19)
357 357 airbrake
358 358 better_errors
359 359 binding_of_caller
... ... @@ -397,7 +397,7 @@ DEPENDENCIES
397 397 rack-ssl
398 398 rack-ssl-enforcer
399 399 rails_autolink
400   - railties (~> 3.2.18)
  400 + railties (~> 3.2.19)
401 401 ri_cal
402 402 rspec-rails
403 403 ruby-fogbugz
... ...