updated magent, now using my fork untill bugfix gets pulled

This commit is contained in:
maxwell 2010-11-17 13:49:12 -08:00
parent 387a7628a8
commit 045c8f1aac
3 changed files with 21 additions and 19 deletions

View file

@ -37,7 +37,7 @@ gem 'thin'
#Websocket #Websocket
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket' gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket'
gem 'magent', :git => 'git://github.com/dcu/magent.git' gem 'magent', :git => 'git://github.com/maxwell/magent.git'
#File uploading #File uploading
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch

View file

@ -13,15 +13,6 @@ GIT
devise-mongo_mapper (0.0.1) devise-mongo_mapper (0.0.1)
devise (~> 1.1.0) devise (~> 1.1.0)
GIT
remote: git://github.com/dcu/magent.git
revision: 90ee5db241abd2e2b7d7de5c80f0d7c5b4b8db2d
specs:
magent (0.5.1)
em-websocket
mongo
uuidtools
GIT GIT
remote: git://github.com/iain/http_accept_language.git remote: git://github.com/iain/http_accept_language.git
revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
@ -55,6 +46,15 @@ GIT
activesupport (~> 3.0.0) activesupport (~> 3.0.0)
plucky (~> 0.3.6) plucky (~> 0.3.6)
GIT
remote: git://github.com/maxwell/magent.git
revision: af5ad4b58e27fc0ca49bea8ab11ec3f746e92f33
specs:
magent (0.5.1)
em-websocket
mongo
uuidtools
GIT GIT
remote: git://github.com/rsofaer/carrierwave.git remote: git://github.com/rsofaer/carrierwave.git
revision: c3dfbdda2fa227af91fe383bb126f59b991a318f revision: c3dfbdda2fa227af91fe383bb126f59b991a318f

View file

@ -36,9 +36,11 @@
= csrf_meta_tag = csrf_meta_tag
= yield(:head) = yield(:head)
-if true#APP_CONFIG[:google_a_site]
:javascript :javascript
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-17207587-5']); _gaq.push(['_setAccount', '#{APP_CONFIG[:google_a_site]}']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function() { (function() {