Skip to content

Commit

Permalink
Merge pull request avoinministerio#335 from naleksi/master
Browse files Browse the repository at this point in the history 
Rails update 3.2.12
  • Loading branch information
@naleksi
naleksi committed Feb 14, 2013
2 parents c34ab0f + 0813860 commit f4f874b
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 67 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "rails", "3.2.11"
gem "rails", "3.2.12"

# Gems used only for assets and not required
# in production environments by default.
Expand Down
129 changes: 63 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/NUBIC/surveyor.git
revision: 9e9e8488216b575a32a0e793ec8de1104df981cd
revision: 8276bdbec15d3ff37cd35b016177762489612585
specs:
surveyor (1.2.1pre)
fastercsv (~> 1.5.4)
Expand All @@ -22,31 +22,31 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.11)
actionpack (= 3.2.11)
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
activemodel (3.2.12)
activesupport (= 3.2.12)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
Expand Down Expand Up @@ -79,8 +79,8 @@ GEM
capybara-mechanize (0.3.0)
capybara (~> 1.1)
mechanize (~> 2.3)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11)
choice (0.1.6)
coderay (1.0.8)
coffee-rails (3.2.2)
Expand All @@ -94,14 +94,14 @@ GEM
columnize (0.3.6)
crack (0.3.2)
database_cleaner (0.9.1)
debugger (1.2.3)
debugger (1.3.1)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.5)
debugger-ruby_core_source (~> 1.1.8)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.6)
devise (2.2.0)
debugger-ruby_core_source (1.1.8)
devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
Expand All @@ -121,7 +121,7 @@ GEM
factory_girl_rails (1.4.0)
factory_girl (~> 2.3.0)
railties (>= 3.0.0)
faraday (0.8.4)
faraday (0.8.5)
multipart-post (~> 1.1)
fastercsv (1.5.5)
ffi (1.3.1)
Expand All @@ -137,11 +137,11 @@ GEM
guard-spork (1.0.0)
guard (>= 1.0.0)
spork (>= 0.8.4)
haml (3.1.7)
haml-rails (0.3.5)
haml (3.1.8)
haml-rails (0.4)
actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1)
haml (~> 3.1)
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hashie (1.2.0)
highline (1.6.15)
Expand All @@ -152,15 +152,15 @@ GEM
i18n_routing (0.6.2)
i18n (> 0.3.5)
journey (1.0.4)
jquery-rails (2.1.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
json_pure (1.7.6)
json (1.7.7)
json_pure (1.7.7)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.7.4)
launchy (2.1.2)
kgio (2.8.0)
launchy (2.2.0)
addressable (~> 2.3)
letters (0.3.1)
activesupport
Expand All @@ -171,9 +171,6 @@ GEM
libnotify (0.8.0)
ffi (>= 1.0.11)
libv8 (3.11.8.13)
libwebsocket (0.1.7.1)
addressable
websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand All @@ -188,10 +185,10 @@ GEM
webrobots (~> 0.0, >= 0.0.9)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.19)
mime-types (1.21)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.5.0)
multi_json (1.6.0)
multipart-post (1.1.5)
mustache (0.99.4)
net-http-digest_auth (1.2.1)
Expand All @@ -205,7 +202,7 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.1)
omniauth (1.1.2)
hashie (~> 1.2)
rack
omniauth-facebook (1.4.1)
Expand All @@ -216,31 +213,31 @@ GEM
orm_adapter (0.4.0)
pg (0.14.1)
polyglot (0.3.3)
pry (0.9.10)
pry (0.9.12)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
slop (~> 3.4)
pry-rails (0.2.2)
pry (>= 0.9.10)
rabl (0.6.14)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
rack (1.4.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
bundler (~> 1.0)
railties (= 3.2.11)
rails-erd (1.0.0)
railties (= 3.2.12)
rails-erd (1.1.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
choice (~> 0.1.6)
Expand All @@ -249,25 +246,25 @@ GEM
i18n (~> 0.5)
rails-translate-routes (0.1.3)
activesupport (>= 3.1)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3)
rb-fsevent (0.9.3)
rdoc (3.12)
rdoc (3.12.1)
json (~> 1.4)
redcarpet (2.2.2)
ref (1.0.2)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
rspec-rails (2.12.1)
rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
Expand All @@ -288,11 +285,11 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.27.2)
selenium-webdriver (2.29.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
sexp_processor (3.2.0)
shoulda-matchers (1.4.2)
activesupport (>= 3.0.0)
Expand All @@ -304,7 +301,7 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.3.3)
slop (3.4.3)
spork (1.0.0rc3)
spork-rails (3.2.1)
rails (>= 3.0.0, < 3.3.0)
Expand All @@ -314,18 +311,18 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
sqlite3 (1.3.7)
state_machine (1.1.2)
steak (2.0.0)
capybara (>= 1.0.0)
rspec-rails (>= 2.5.0)
terminal-table (1.4.5)
therubyracer (0.11.1)
libv8 (~> 3.11.8.7)
therubyracer (0.11.3)
libv8 (~> 3.11.8.12)
ref
thor (0.16.0)
thor (0.17.0)
tilt (1.3.3)
timecop (0.5.9)
timecop (0.5.9.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
Expand All @@ -338,7 +335,7 @@ GEM
unf (0.0.5)
unf_ext
unf_ext (0.0.5)
unicorn (4.5.0)
unicorn (4.6.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
Expand All @@ -349,7 +346,7 @@ GEM
addressable (>= 2.2.7)
crack (>= 0.1.7)
webrobots (0.0.13)
websocket (1.0.6)
websocket (1.0.7)
will_paginate (3.0.4)
xml-simple (1.1.2)
xpath (0.1.4)
Expand Down Expand Up @@ -385,7 +382,7 @@ DEPENDENCIES
omniauth-facebook
pg
pry-rails
rails (= 3.2.11)
rails (= 3.2.12)
rails-erd
rails-i18n
rails-translate-routes
Expand Down

0 comments on commit f4f874b

Please sign in to comment.