Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump actionpack from 3.2.3 to 3.2.22.5 #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump actionpack from 3.2.3 to 3.2.22.5 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 90 additions & 80 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,54 @@ PATH
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.3)
actionpack (= 3.2.3)
mail (~> 2.4.4)
actionpack (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
actionmailer (3.2.22.5)
actionpack (= 3.2.22.5)
mail (~> 2.5.4)
actionpack (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
active_utils (1.0.3)
activesupport (>= 2.3.11)
sprockets (~> 2.2.1)
active_utils (3.3.14)
activesupport (>= 3.2, < 6.0)
i18n
activemerchant (1.20.4)
activemerchant (1.28.0)
active_utils (>= 1.0.2)
activesupport (>= 2.3.11)
braintree (>= 2.0.0)
builder (>= 2.0.0)
i18n
json (>= 1.5.1)
money (<= 3.7.1)
activemodel (3.2.3)
activesupport (= 3.2.3)
money
nokogiri
activemodel (3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
activerecord (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activerecord (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activesupport (3.2.3)
i18n (~> 0.6)
activeresource (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts_as_list (0.1.4)
addressable (2.2.8)
archive-tar-minitar (0.5.2)
arel (3.0.2)
arel (3.0.3)
aws-sdk (1.3.9)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
braintree (2.16.0)
builder (>= 2.0.0)
builder (3.0.0)
builder (3.0.4)
capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -67,11 +65,16 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.2)
ffi (~> 1.0.6)
cocaine (0.2.1)
climate_control (0.2.0)
cocaine (0.6.0)
terrapin (= 0.6.0)
colorize (0.8.1)
columnize (0.3.6)
deface (0.9.1)
nokogiri (~> 1.5.0)
rails (~> 3.1)
deface (1.0.2)
colorize (>= 0.5.8)
nokogiri (~> 1.6.0)
polyglot
rails (>= 3.1)
diff-lcs (1.1.3)
erubis (2.7.0)
factory_girl (2.6.4)
Expand All @@ -80,16 +83,16 @@ GEM
ffi (1.0.11)
haml (3.1.6)
highline (1.6.11)
hike (1.2.1)
httparty (0.8.3)
multi_json (~> 1.0)
multi_xml
i18n (0.6.0)
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.3)
hike (1.2.3)
httparty (0.13.0)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.11)
journey (1.0.4)
jquery-rails (2.3.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -100,55 +103,57 @@ GEM
addressable
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
money (3.7.1)
mime-types (1.25.1)
mini_portile (0.5.3)
money (5.0.0)
i18n (~> 0.4)
multi_json (1.3.6)
multi_xml (0.5.1)
json
multi_json (1.14.0)
multi_xml (0.6.0)
nested_set (1.7.0)
activerecord (>= 3.0.0)
railties (>= 3.0.0)
nokogiri (1.5.2)
paperclip (2.7.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
paperclip (2.8.0)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
rack (1.4.1)
polyglot (0.3.5)
rack (1.4.7)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.3)
actionmailer (= 3.2.3)
actionpack (= 3.2.3)
activerecord (= 3.2.3)
activeresource (= 3.2.3)
activesupport (= 3.2.3)
rails (3.2.22.5)
actionmailer (= 3.2.22.5)
actionpack (= 3.2.22.5)
activerecord (= 3.2.22.5)
activeresource (= 3.2.22.5)
activesupport (= 3.2.22.5)
bundler (~> 1.0)
railties (= 3.2.3)
railties (3.2.3)
actionpack (= 3.2.3)
activesupport (= 3.2.3)
railties (= 3.2.22.5)
railties (3.2.22.5)
actionpack (= 3.2.22.5)
activesupport (= 3.2.22.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
thor (>= 0.14.6, < 2.0)
rake (10.5.0)
ransack (0.6.0)
actionpack (~> 3.0)
activerecord (~> 3.0)
polyamorous (~> 0.5.0)
rdoc (3.12)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.10.0)
rspec-core (~> 2.10.0)
Expand Down Expand Up @@ -180,35 +185,40 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
spree_core (1.1.1)
activemerchant (= 1.20.4)
spree_core (1.1.6)
activemerchant (= 1.28.0)
acts_as_list (= 0.1.4)
aws-sdk (~> 1.3.4)
deface (>= 0.8.0)
deface (>= 0.9.0)
ffaker (~> 1.12.0)
highline (= 1.6.11)
jquery-rails (~> 2.0.0)
kaminari (>= 0.13.0)
jquery-rails (~> 2.0)
json (>= 1.5.5)
kaminari (= 0.13.0)
money (= 5.0.0)
nested_set (= 1.7.0)
paperclip (~> 2.7)
rails (>= 3.2.2, <= 3.2.3)
paperclip (~> 2.8)
rails (~> 3.2.12)
ransack (~> 0.6.0)
state_machine (= 1.1.2)
stringex (~> 1.3.2)
sprockets (2.1.3)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
state_machine (1.1.2)
stringex (1.3.3)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
uuidtools (2.1.2)
tzinfo (0.3.55)
uuidtools (2.1.5)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand Down