From 9c720575ced6469cc3c294fb8cd14d7ba0ce986b Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 1 Jul 2010 20:04:26 -0700
Subject: [PATCH 1/7] locking bundler

---
 Gemfile.lock | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 278 insertions(+)
 create mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..2746b0a34
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,278 @@
+--- 
+dependencies: 
+  bson_ext: 
+    group: 
+    - :default
+    version: = 1.0.1
+  ruby-debug: 
+    group: 
+    - :development
+    version: ">= 0"
+  mongo_mapper: 
+    group: 
+    - :default
+    version: ">= 0"
+  rails: 
+    group: 
+    - :default
+    version: = 3.0.0.beta4
+  mongo_ext: 
+    group: 
+    - :default
+    version: ">= 0"
+  haml: 
+    group: 
+    - :default
+    version: ">= 0"
+  em-websocket: 
+    group: 
+    - :default
+    version: ">= 0"
+  sprinkle: 
+    group: 
+    - :deployment
+    version: ">= 0"
+  addressable: 
+    group: 
+    - :default
+    version: ">= 0"
+    require: 
+    - addressable/uri
+  autotest: 
+    group: 
+    - :test
+    version: ">= 0"
+  rspec: 
+    group: 
+    - :test
+    version: ">= 2.0.0.beta.12"
+  jnunemaker-validatable: 
+    group: 
+    - :default
+    version: ">= 0"
+  thin: 
+    group: 
+    - :default
+    version: ">= 0"
+  rspec-rails: 
+    group: 
+    - :test
+    version: ">= 2.0.0.beta.8"
+  database_cleaner: 
+    group: 
+    - :test
+    version: ">= 0"
+  mocha: 
+    group: 
+    - :test
+    version: ">= 0"
+  roxml: 
+    group: 
+    - :default
+    version: ">= 0"
+  devise: 
+    group: 
+    - :default
+    version: ">= 0"
+  em-http-request: 
+    group: 
+    - :default
+    version: ">= 0"
+    require: 
+    - em-http
+  will_paginate: 
+    group: 
+    - :default
+    version: = 3.0.pre
+  webrat: 
+    group: 
+    - :test
+    version: ">= 0"
+  redgreen: 
+    group: 
+    - :test
+    version: ">= 0"
+  nifty-generators: 
+    group: 
+    - :development
+    version: ">= 0"
+  factory_girl_rails: 
+    group: 
+    - :test
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- abstract: 
+    version: 1.0.0
+- activesupport: 
+    version: 3.0.0.beta4
+- builder: 
+    version: 2.1.2
+- i18n: 
+    version: 0.4.1
+- activemodel: 
+    version: 3.0.0.beta4
+- erubis: 
+    version: 2.6.6
+- rack: 
+    version: 1.1.0
+- rack-mount: 
+    version: 0.6.6
+- rack-test: 
+    version: 0.5.4
+- tzinfo: 
+    version: 0.3.22
+- actionpack: 
+    version: 3.0.0.beta4
+- mime-types: 
+    version: "1.16"
+- polyglot: 
+    version: 0.3.1
+- treetop: 
+    version: 1.4.8
+- mail: 
+    version: 2.2.5
+- actionmailer: 
+    version: 3.0.0.beta4
+- arel: 
+    version: 0.4.0
+- activerecord: 
+    version: 3.0.0.beta4
+- activeresource: 
+    version: 3.0.0.beta4
+- addressable: 
+    version: 2.1.2
+- autotest: 
+    version: 4.3.2
+- bcrypt-ruby: 
+    version: 2.1.2
+- bson: 
+    version: 1.0.3
+- bson_ext: 
+    version: 1.0.1
+- bundler: 
+    version: 0.9.26
+- highline: 
+    version: 1.5.2
+- net-ssh: 
+    version: 2.0.23
+- net-scp: 
+    version: 1.0.2
+- net-sftp: 
+    version: 2.0.4
+- net-ssh-gateway: 
+    version: 1.0.1
+- capistrano: 
+    version: 2.5.19
+- columnize: 
+    version: 0.3.1
+- daemons: 
+    version: 1.1.0
+- database_cleaner: 
+    version: 0.5.2
+- warden: 
+    version: 0.10.7
+- devise: 
+    version: 1.1.rc1
+    source: 4
+- diff-lcs: 
+    version: 1.1.2
+- eventmachine: 
+    version: 0.12.10
+- em-http-request: 
+    version: 0.2.8
+    source: 1
+- em-websocket: 
+    version: 0.1.2
+- factory_girl: 
+    version: 1.3.1
+- thor: 
+    version: 0.13.7
+- railties: 
+    version: 3.0.0.beta4
+- rails: 
+    version: 3.0.0.beta4
+- factory_girl_rails: 
+    version: "1.0"
+- haml: 
+    version: 3.0.13
+- jnunemaker-validatable: 
+    version: 1.8.4
+    source: 3
+- linecache: 
+    version: "0.43"
+- mocha: 
+    version: 0.9.8
+- mongo: 
+    version: 1.0.3
+- mongo_ext: 
+    version: 0.19.3
+- plucky: 
+    version: 0.3.2
+- mongo_mapper: 
+    version: 0.8.2
+    source: 5
+- nifty-generators: 
+    version: 0.4.0
+- nokogiri: 
+    version: 1.4.2
+- redgreen: 
+    version: 1.2.2
+- roxml: 
+    version: 3.1.5
+    source: 2
+- rspec-core: 
+    version: 2.0.0.beta.13
+- rspec-expectations: 
+    version: 2.0.0.beta.13
+- rspec-mocks: 
+    version: 2.0.0.beta.13
+- rspec: 
+    version: 2.0.0.beta.13
+- webrat: 
+    version: 0.7.1
+- rspec-rails: 
+    version: 2.0.0.beta.13
+- ruby-debug-base: 
+    version: 0.10.3
+- ruby-debug: 
+    version: 0.10.3
+- sprinkle: 
+    version: 0.0.0
+    source: 0
+- thin: 
+    version: 1.2.7
+- will_paginate: 
+    version: 3.0.pre
+hash: a56a0c4b4623a1459e3603a67d1ebd64e9c88218
+sources: 
+- Git: 
+    uri: git://github.com/rsofaer/sprinkle.git
+    git: git://github.com/rsofaer/sprinkle.git
+    ref: 2b5a1e908e0969080f9185a84e2d902f1a11fcd3
+- Git: 
+    uri: git://github.com/igrigorik/em-http-request.git
+    require: em-http
+    git: git://github.com/igrigorik/em-http-request.git
+    ref: 6415a20871d8d260fc6e0bdcd8375181511fb294
+- Git: 
+    uri: git://github.com/Empact/roxml.git
+    git: git://github.com/Empact/roxml.git
+    ref: 33034d3e632b3a14565a791af0a63c7e23ec0de4
+- Git: 
+    uri: http://github.com/BadMinus/validatable.git
+    git: http://github.com/BadMinus/validatable.git
+    ref: 942ee52e3d9cbc6ae9dd63153f26c3a92a99c3d8
+- Git: 
+    uri: http://github.com/BadMinus/devise.git
+    git: http://github.com/BadMinus/devise.git
+    ref: 88ab2fe14e88dc45d5b969328a5e52e9011a1d7b
+- Git: 
+    uri: http://github.com/BadMinus/mongomapper.git
+    git: http://github.com/BadMinus/mongomapper.git
+    ref: 520850b003c047a9b0fba5b1f266ec0c239ec07e
+- Rubygems: 
+    uri: http://rubygems.org
+- Rubygems: 
+    uri: http://gemcutter.org

From a96be34b7be8a158412c3aac74b234c79b5941dd Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 1 Jul 2010 20:11:53 -0700
Subject: [PATCH 3/7] Gave up on bundle lock

---
 Gemfile.lock | 278 ---------------------------------------------------
 1 file changed, 278 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 2746b0a34..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,278 +0,0 @@
---- 
-dependencies: 
-  bson_ext: 
-    group: 
-    - :default
-    version: = 1.0.1
-  ruby-debug: 
-    group: 
-    - :development
-    version: ">= 0"
-  mongo_mapper: 
-    group: 
-    - :default
-    version: ">= 0"
-  rails: 
-    group: 
-    - :default
-    version: = 3.0.0.beta4
-  mongo_ext: 
-    group: 
-    - :default
-    version: ">= 0"
-  haml: 
-    group: 
-    - :default
-    version: ">= 0"
-  em-websocket: 
-    group: 
-    - :default
-    version: ">= 0"
-  sprinkle: 
-    group: 
-    - :deployment
-    version: ">= 0"
-  addressable: 
-    group: 
-    - :default
-    version: ">= 0"
-    require: 
-    - addressable/uri
-  autotest: 
-    group: 
-    - :test
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :test
-    version: ">= 2.0.0.beta.12"
-  jnunemaker-validatable: 
-    group: 
-    - :default
-    version: ">= 0"
-  thin: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec-rails: 
-    group: 
-    - :test
-    version: ">= 2.0.0.beta.8"
-  database_cleaner: 
-    group: 
-    - :test
-    version: ">= 0"
-  mocha: 
-    group: 
-    - :test
-    version: ">= 0"
-  roxml: 
-    group: 
-    - :default
-    version: ">= 0"
-  devise: 
-    group: 
-    - :default
-    version: ">= 0"
-  em-http-request: 
-    group: 
-    - :default
-    version: ">= 0"
-    require: 
-    - em-http
-  will_paginate: 
-    group: 
-    - :default
-    version: = 3.0.pre
-  webrat: 
-    group: 
-    - :test
-    version: ">= 0"
-  redgreen: 
-    group: 
-    - :test
-    version: ">= 0"
-  nifty-generators: 
-    group: 
-    - :development
-    version: ">= 0"
-  factory_girl_rails: 
-    group: 
-    - :test
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- abstract: 
-    version: 1.0.0
-- activesupport: 
-    version: 3.0.0.beta4
-- builder: 
-    version: 2.1.2
-- i18n: 
-    version: 0.4.1
-- activemodel: 
-    version: 3.0.0.beta4
-- erubis: 
-    version: 2.6.6
-- rack: 
-    version: 1.1.0
-- rack-mount: 
-    version: 0.6.6
-- rack-test: 
-    version: 0.5.4
-- tzinfo: 
-    version: 0.3.22
-- actionpack: 
-    version: 3.0.0.beta4
-- mime-types: 
-    version: "1.16"
-- polyglot: 
-    version: 0.3.1
-- treetop: 
-    version: 1.4.8
-- mail: 
-    version: 2.2.5
-- actionmailer: 
-    version: 3.0.0.beta4
-- arel: 
-    version: 0.4.0
-- activerecord: 
-    version: 3.0.0.beta4
-- activeresource: 
-    version: 3.0.0.beta4
-- addressable: 
-    version: 2.1.2
-- autotest: 
-    version: 4.3.2
-- bcrypt-ruby: 
-    version: 2.1.2
-- bson: 
-    version: 1.0.3
-- bson_ext: 
-    version: 1.0.1
-- bundler: 
-    version: 0.9.26
-- highline: 
-    version: 1.5.2
-- net-ssh: 
-    version: 2.0.23
-- net-scp: 
-    version: 1.0.2
-- net-sftp: 
-    version: 2.0.4
-- net-ssh-gateway: 
-    version: 1.0.1
-- capistrano: 
-    version: 2.5.19
-- columnize: 
-    version: 0.3.1
-- daemons: 
-    version: 1.1.0
-- database_cleaner: 
-    version: 0.5.2
-- warden: 
-    version: 0.10.7
-- devise: 
-    version: 1.1.rc1
-    source: 4
-- diff-lcs: 
-    version: 1.1.2
-- eventmachine: 
-    version: 0.12.10
-- em-http-request: 
-    version: 0.2.8
-    source: 1
-- em-websocket: 
-    version: 0.1.2
-- factory_girl: 
-    version: 1.3.1
-- thor: 
-    version: 0.13.7
-- railties: 
-    version: 3.0.0.beta4
-- rails: 
-    version: 3.0.0.beta4
-- factory_girl_rails: 
-    version: "1.0"
-- haml: 
-    version: 3.0.13
-- jnunemaker-validatable: 
-    version: 1.8.4
-    source: 3
-- linecache: 
-    version: "0.43"
-- mocha: 
-    version: 0.9.8
-- mongo: 
-    version: 1.0.3
-- mongo_ext: 
-    version: 0.19.3
-- plucky: 
-    version: 0.3.2
-- mongo_mapper: 
-    version: 0.8.2
-    source: 5
-- nifty-generators: 
-    version: 0.4.0
-- nokogiri: 
-    version: 1.4.2
-- redgreen: 
-    version: 1.2.2
-- roxml: 
-    version: 3.1.5
-    source: 2
-- rspec-core: 
-    version: 2.0.0.beta.13
-- rspec-expectations: 
-    version: 2.0.0.beta.13
-- rspec-mocks: 
-    version: 2.0.0.beta.13
-- rspec: 
-    version: 2.0.0.beta.13
-- webrat: 
-    version: 0.7.1
-- rspec-rails: 
-    version: 2.0.0.beta.13
-- ruby-debug-base: 
-    version: 0.10.3
-- ruby-debug: 
-    version: 0.10.3
-- sprinkle: 
-    version: 0.0.0
-    source: 0
-- thin: 
-    version: 1.2.7
-- will_paginate: 
-    version: 3.0.pre
-hash: a56a0c4b4623a1459e3603a67d1ebd64e9c88218
-sources: 
-- Git: 
-    uri: git://github.com/rsofaer/sprinkle.git
-    git: git://github.com/rsofaer/sprinkle.git
-    ref: 2b5a1e908e0969080f9185a84e2d902f1a11fcd3
-- Git: 
-    uri: git://github.com/igrigorik/em-http-request.git
-    require: em-http
-    git: git://github.com/igrigorik/em-http-request.git
-    ref: 6415a20871d8d260fc6e0bdcd8375181511fb294
-- Git: 
-    uri: git://github.com/Empact/roxml.git
-    git: git://github.com/Empact/roxml.git
-    ref: 33034d3e632b3a14565a791af0a63c7e23ec0de4
-- Git: 
-    uri: http://github.com/BadMinus/validatable.git
-    git: http://github.com/BadMinus/validatable.git
-    ref: 942ee52e3d9cbc6ae9dd63153f26c3a92a99c3d8
-- Git: 
-    uri: http://github.com/BadMinus/devise.git
-    git: http://github.com/BadMinus/devise.git
-    ref: 88ab2fe14e88dc45d5b969328a5e52e9011a1d7b
-- Git: 
-    uri: http://github.com/BadMinus/mongomapper.git
-    git: http://github.com/BadMinus/mongomapper.git
-    ref: 520850b003c047a9b0fba5b1f266ec0c239ec07e
-- Rubygems: 
-    uri: http://rubygems.org
-- Rubygems: 
-    uri: http://gemcutter.org

From ad5c8ba548e25cef544b60f1c093be4819e22252 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 1 Jul 2010 20:30:19 -0700
Subject: [PATCH 4/7] dev env

---
 config/thin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/thin.yml b/config/thin.yml
index f60fed103..c46f482c2 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -7,7 +7,7 @@ max_conns: 1024
 require: []
 
 max_persistent_conns: 512
-environment: production
+environment: development
 servers: 1
 daemonize: true
 #chdir: /usr/applications/localhash/current

From 418635aa722e213283a19fcd7569d5a5c274788c Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 1 Jul 2010 22:13:55 -0700
Subject: [PATCH 6/7] Added google to session wall layout

---
 app/views/layouts/session_wall.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 5bdf2d6ce..b06fa30d4 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -9,7 +9,7 @@
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "sessions"
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery142'
+    = javascript_include_tag 'jquery142', 'google_a'
   
     = csrf_meta_tag
     = yield(:head)

From 737614e04befd7d9bbb4a8078029a1f32816c0b9 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 1 Jul 2010 22:20:57 -0700
Subject: [PATCH 7/7] google analytics for real

---
 app/views/layouts/application.html.haml  | 2 +-
 app/views/layouts/session_wall.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 36af0216f..9bd3c7f9d 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,7 +9,7 @@
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "application"
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'google_a'
+    = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'google'
     = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel'
     = render 'js/websocket_js'
     
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index b06fa30d4..f4b13e524 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -9,7 +9,7 @@
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "sessions"
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery142', 'google_a'
+    = javascript_include_tag 'jquery142', 'google'
   
     = csrf_meta_tag
     = yield(:head)