Skip to content

Commit

Permalink
[api][webui] update to rails 3.2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Feb 13, 2013
1 parent be3253f commit 1ca2dad
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 74 deletions.
50 changes: 25 additions & 25 deletions src/api/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
GEM
remote: http://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)
activesupport (3.2.11)
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
builder (3.0.4)
ci_reporter (1.8.3)
ci_reporter (1.8.4)
builder (>= 2.1.2)
coderay (1.0.8)
crack (0.3.1)
crack (0.3.2)
daemons (1.1.9)
database_cleaner (0.9.1)
delayed_job (3.0.4)
delayed_job (3.0.5)
activesupport (~> 3.0)
delayed_job_active_record (0.3.3)
activerecord (>= 2.1.0, < 4)
Expand All @@ -49,15 +49,15 @@ GEM
builder
i18n (0.6.1)
journey (1.0.4)
json (1.7.6)
json (1.7.7)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcache-client (1.8.5)
method_source (0.8.1)
mime-types (1.19)
minitest (4.4.0)
mime-types (1.20.1)
minitest (4.5.0)
multi_json (1.5.0)
mysql2 (0.3.11)
nokogiri (1.5.6)
Expand All @@ -70,17 +70,17 @@ GEM
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-api (0.0.3)
actionpack (>= 3.2.6)
railties (>= 3.2.6)
tzinfo (~> 0.3.31)
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)
Expand All @@ -94,15 +94,15 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.3.3)
slop (3.3.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.16.0)
thor (0.17.0)
tilt (1.3.3)
timecop (0.5.9)
timecop (0.5.9.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
Expand Down
95 changes: 46 additions & 49 deletions src/webui/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
GEM
remote: http://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 All @@ -38,16 +38,16 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
capybara-webkit (0.14.0)
capybara-webkit (0.14.1)
capybara (~> 2.0, >= 2.0.2)
json
capybara_minitest_spec (1.0.0)
capybara (>= 2)
minitest (>= 2)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
chunky_png (1.2.6)
ci_reporter (1.8.3)
childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.7)
ci_reporter (1.8.4)
builder (>= 2.1.2)
codemirror-rails (3.00)
railties (~> 3.0)
Expand All @@ -59,7 +59,7 @@ GEM
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
cssmin (1.0.2)
delayed_job (3.0.4)
delayed_job (3.0.5)
activesupport (~> 3.0)
delayed_job_active_record (0.3.3)
activerecord (>= 2.1.0, < 4)
Expand All @@ -70,9 +70,9 @@ GEM
faker (1.1.2)
i18n (~> 0.5)
fast_xs (0.8.0)
ffi (1.3.0)
fssm (0.2.9)
headless (0.3.1)
ffi (1.3.1)
fssm (0.2.10)
headless (1.0.0)
hike (1.2.1)
hoptoad_notifier (2.4.11)
activesupport
Expand All @@ -81,26 +81,23 @@ GEM
journey (1.0.4)
jquery-datatables-rails (1.11.2)
jquery-rails
jquery-rails (2.1.4)
jquery-rails (2.2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
json (1.7.7)
launchy (2.1.2)
addressable (~> 2.3)
libwebsocket (0.1.7.1)
addressable
websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcache-client (1.8.5)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.19)
minitest (4.4.0)
mime-types (1.20.1)
minitest (4.5.0)
mobileesp_converted (0.2.1)
mocha (0.13.1)
mocha (0.13.2)
metaclass (~> 0.0.1)
multi_json (1.5.0)
mysql2 (0.3.11)
Expand All @@ -116,21 +113,21 @@ GEM
rack (>= 0.4)
rack-mini-profiler (0.1.23)
rack (>= 1.1.3)
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)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
railties (= 3.2.12)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -144,25 +141,25 @@ 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)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.3.3)
slop (3.3.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.16.0)
sqlite3 (1.3.7)
thor (0.17.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
Expand All @@ -171,7 +168,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
websocket (1.0.6)
websocket (1.0.7)
xmlhash (1.3.5)
pkg-config
xpath (1.0.0)
Expand Down

0 comments on commit 1ca2dad

Please sign in to comment.