Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Bump rails to 4.0.2
Browse files Browse the repository at this point in the history
- Fixes CVEs http://weblog.rubyonrails.org/2013/12/3/Rails_3_2_16_and_4_0_2_have_been_released/
- ActiveRecord queries with multiple conditions needs a new syntax
  • Loading branch information
Graham Siener committed Dec 6, 2013
1 parent 4421f3f commit 186765d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
62 changes: 31 additions & 31 deletions Gemfile.lock
Expand Up @@ -33,25 +33,25 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
Expand All @@ -63,7 +63,7 @@ GEM
builder
json
archive-tar-minitar (0.5.2)
arel (4.0.0)
arel (4.0.1)
atomic (1.1.14)
awesome_print (1.1.0)
bcrypt-ruby (3.1.0)
Expand Down Expand Up @@ -147,10 +147,10 @@ GEM
excon (0.25.1)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
fakeweb (1.3.0)
faraday (0.8.7)
Expand Down Expand Up @@ -194,7 +194,7 @@ GEM
hike (1.2.3)
http_parser.rb (0.6.0.beta.2)
httpauth (0.2.0)
i18n (0.6.5)
i18n (0.6.9)
jasmine-core (1.3.1)
jasmine-rails (0.4.5)
jasmine-core (~> 1.3)
Expand Down Expand Up @@ -222,10 +222,10 @@ GEM
treetop (~> 1.4.8)
mario (0.0.6)
method_source (0.8.1)
mime-types (1.23)
mime-types (1.25.1)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.8.1)
multi_json (1.8.2)
multipart-post (1.2.0)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
Expand Down Expand Up @@ -273,13 +273,13 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
rails-backbone (0.9.10)
coffee-script (~> 2.2.0)
Expand All @@ -291,9 +291,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.1)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.11.0)
Expand Down Expand Up @@ -342,12 +342,12 @@ GEM
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slop (3.4.5)
sprockets (2.10.0)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
Expand All @@ -363,10 +363,10 @@ GEM
atomic
tilt (1.4.1)
timecop (0.6.1)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down
2 changes: 1 addition & 1 deletion app/models/project.rb
Expand Up @@ -248,7 +248,7 @@ def update_refreshed_at(status)
def remove_outdated_status(status)
if statuses.count > MAX_STATUS
keepers = statuses.order('created_at DESC').limit(MAX_STATUS)
ProjectStatus.delete_all(["project_id = ? AND id not in (?)", id, keepers]) if keepers.any?
ProjectStatus.delete_all(["project_id = ? AND id not in (?)", id, keepers.map(&:id)]) if keepers.any?
end
end

Expand Down

0 comments on commit 186765d

Please sign in to comment.