fix missing gem due to last merge with validation branch

2 files changed, 17 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index 280fb557c..b0372c67b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,19 +1,19 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.6'    
+gem 'rails', '3.2.6'
 
 platforms :jruby do
   gem 'activerecord-jdbcpostgresql-adapter', '1.2.9'
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jruby-openssl'
   gem "jruby-rack-worker"
-  gem 'warbler'   
-  gem 'therubyrhino'      
+  gem 'warbler'
+  gem 'therubyrhino'
 end
 
 platforms :ruby do
-  gem 'therubyracer', '~> 0.10.2'          
-  gem 'pg', '~> 0.11.0' 
+  gem 'therubyracer', '~> 0.10.2'
+  gem 'pg', '~> 0.11.0'
   gem 'sqlite3'
 end
 
@@ -45,6 +45,7 @@ gem 'rubyzip', :require => 'zip/zip'
 
 # Controller
 gem 'inherited_resources'
+gem 'google-analytics-rails'
 
 # Model
 gem 'will_paginate', '~> 3.0'
@@ -71,20 +72,20 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
-group :development do 
+group :development do
   gem 'capistrano'
-  gem 'capistrano-ext'   
+  gem 'capistrano-ext'
   gem 'guard'
   gem 'guard-rspec'
-  gem 'rails-erd'       
+  gem 'rails-erd'
 end
 
 group :test, :development do
   gem "rspec-rails", "~> 2.0"
-  gem "remarkable", "~> 4.0.0.alpha4"           
-  gem "remarkable_activerecord", "~> 4.0.0.alpha4" 
+  gem "remarkable", "~> 4.0.0.alpha4"
+  gem "remarkable_activerecord", "~> 4.0.0.alpha4"
   gem "shoulda-matchers"
-  gem 'capybara'     
+  gem 'capybara'
   gem 'launchy'
   gem 'factory_girl_rails', '1.7'
   gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
@@ -93,5 +94,6 @@ end
 
 group :production do
    gem "SyslogLogger"
+   gem "daemons"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9cd208a8f..a3bce8308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,6 +92,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    daemons (1.1.9)
     dbf (2.0.5)
       fastercsv (~> 1.5.4)
     delayed_job (3.0.3)
@@ -134,6 +135,7 @@ GEM
     geokit (1.6.5)
       multi_json
     georuby (1.9.8)
+    google-analytics-rails (0.0.4)
     gravatar_image_tag (1.1.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -341,6 +343,7 @@ DEPENDENCIES
   cocoon (= 1.1.2)
   coffee-rails (~> 3.2.1)
   coffee-script-source
+  daemons
   delayed_job_active_record
   devise (= 2.1.3)
   devise_invitable
@@ -349,6 +352,7 @@ DEPENDENCIES
   font-awesome-sass
   formtastic
   georuby-ext!
+  google-analytics-rails
   gravatar_image_tag
   guard
   guard-rspec