Skip to content

Commit

Permalink
[dist] update gem dependencies so that api and webui require the same…
Browse files Browse the repository at this point in the history
… gems

Otherwise obs-server will never build
  • Loading branch information
coolo committed Mar 19, 2013
1 parent ccbedd6 commit 945f5d5
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
48 changes: 24 additions & 24 deletions src/api/Gemfile.lock
@@ -1,29 +1,29 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activesupport (3.2.12)
i18n (~> 0.6)
activesupport (3.2.13)
i18n (>= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.3)
arel (3.0.2)
Expand All @@ -50,15 +50,15 @@ GEM
i18n (0.6.4)
journey (1.0.4)
json (1.7.7)
mail (2.4.4)
mail (2.5.3)
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.21)
minitest (4.6.2)
multi_json (1.6.1)
multi_json (1.7.0)
mysql2 (0.3.11)
nokogiri (1.5.6)
pkg-config (1.1.4)
Expand All @@ -78,14 +78,14 @@ GEM
actionpack (>= 3.2.6)
railties (>= 3.2.6)
tzinfo (~> 0.3.31)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (10.0.3)
rdoc (3.12.1)
json (~> 1.4)
simplecov (0.7.1)
Expand All @@ -94,20 +94,20 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.4.3)
slop (3.4.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.17.0)
tilt (1.3.4)
timecop (0.5.9.2)
tilt (1.3.6)
timecop (0.6.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.36)
webmock (1.10.1)
tzinfo (0.3.37)
webmock (1.11.0)
addressable (>= 2.2.7)
crack (>= 0.3.2)
xmlhash (1.3.5)
Expand Down
72 changes: 36 additions & 36 deletions src/webui/Gemfile.lock
@@ -1,32 +1,32 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (>= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.3)
arel (3.0.2)
Expand All @@ -44,7 +44,7 @@ GEM
capybara_minitest_spec (1.0.0)
capybara (>= 2)
minitest (>= 2)
childprocess (0.3.8)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.7)
ci_reporter (1.8.4)
Expand All @@ -58,7 +58,7 @@ GEM
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
cssmin (1.0.2)
cssmin (1.0.3)
delayed_job (3.0.5)
activesupport (~> 3.0)
delayed_job_active_record (0.4.3)
Expand Down Expand Up @@ -87,7 +87,7 @@ GEM
json (1.7.7)
launchy (2.2.0)
addressable (~> 2.3)
mail (2.4.4)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -97,9 +97,9 @@ GEM
mime-types (1.21)
minitest (4.6.2)
mobileesp_converted (0.2.1)
mocha (0.13.2)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.6.1)
multi_json (1.7.0)
mysql2 (0.3.11)
nokogiri (1.5.6)
pkg-config (1.1.4)
Expand All @@ -117,28 +117,28 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.12)
railties (= 3.2.13)
rails_tokeninput (1.6.1.rc1)
railties (>= 3.1.0)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12.2)
rdoc (3.12.1)
json (~> 1.4)
rubyzip (0.9.9)
sass (3.2.6)
sass (3.2.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
Expand All @@ -154,19 +154,19 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.4.3)
slop (3.4.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
thor (0.17.0)
tilt (1.3.4)
tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.36)
tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down

0 comments on commit 945f5d5

Please sign in to comment.