Merge branch 'rails4'

Conflicts:
	Gemfile

Former-commit-id: 2e1c48dceb46f431c6a907a82b8ded3fa15e7c2b [formerly eebe524000c71897b2ce157dd04051041951fba9] [formerly 87db7e00420e7e274ab14ea66e2b867f528b5b7c [formerly 41776897d8412794ab965d9f07096e0fde2a074d]] [formerly 414aa4102a578b37c30fffc85a6cb73cf703ff43 [formerly 22f08e61049a9fe04dae019a81b1ff0b8800993b] [formerly 76ce54c02d5bacdca929dfd4b1bdd23a278a70af [formerly 76ce54c02d5bacdca929dfd4b1bdd23a278a70af [formerly 5e823a646664dbf37409d8358d5f9f629d45eb1c]]]]
Former-commit-id: 3b4c3d9f35ed0b1be6c51cd02110a3c17071ce04 [formerly e49a44155ec74309b556610294d882c2821cf484] [formerly 095126e72c997288af3774a3c1f9c3106cea2a79 [formerly 7f8c5425bd11f77665337aad712501b4a50d9028]]
Former-commit-id: 5047ba78a6298887aa76ed1284efb766c40fa7f2 [formerly 7f27903ea0e77229f938e9c1359b39f8dff241ab]
Former-commit-id: a36d7a3d8c2ab6f1ba4099e1686ed1399f6c86f3
Former-commit-id: eca5208

.gitignore

@@ -12,56 +12,34 @@ public/images/old
 *.DS_STORE
 .sass-cache/
 public/system/avatars
+public/system/homepage_pics
 public/assets/
 public/system/icons
 public/sitemaps/*
 public/system/cache/*.css
 *.bk
 config/newrelic.yml
-Vagrantfile
 .vagrant
 restart.txt
-zansible/files/avatars.zip
 
-zansible/files/considerit.sql.bz2
 
-zansible/files/github_consideritbsd_rsa
+zansible/templates/seeds_for_local_dev/avatars.zip
+zansible/templates/seeds_for_local_dev/considerit.sql.bz2
 
-zansible/files/github_consideritbsd_rsa.pub
+zansible/templates/github/github_consideritbsd_rsa
+zansible/templates/github/github_consideritbsd_rsa.pub
+zansible/templates/github/github_deploy_rsa
+zansible/templates/github/github_deploy_rsa.pub
 
-zansible/files/github_deploy_rsa
+zansible/hosts/group_vars/chalkboardit
+zansible/hosts/group_vars/considerit
+zansible/hosts/group_vars/chlkit
 
-zansible/files/github_deploy_rsa.pub
-
-zansible/files/ssl/chalkboardit/chalkboardit.crt
-
-zansible/files/ssl/chalkboardit/chalkboardit.csr
-
-zansible/files/ssl/chalkboardit/chalkboardit.key
+zansible/hosts/chalkboardit
+zansible/hosts/chlkit
+zansible/hosts/considerit
 
 *.crt
-
 *.sql
 
-zansible/group_vars/chalkboardit
-
-zansible/group_vars/development
-
-zansible/hosts-chalkboardit
-
-zansible/files/ssl/chalkboardit/chalkboardit.key.encrypted
-
-zansible/files/ssl/chalkboardit/chalkboardit.key.nopass
-
-zansible/group_vars/chlkit
-
-zansible/hosts-chlkit
-
-
-public/system/default_avatar/avatar.sketch*
-
-zansible/group_vars/considerit
-
-zansible/hosts-considerit
-
-considerit_pristine_transition.sql
+public/system/default_avatar/avatar.sketch*

.rvmrc

@@ -1 +1 @@
-rvm 1.9.3-p125
+rvm 2.0.0-p247

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem "therubyracer", :require => 'v8'
-gem 'rails', '~>3'
+gem 'rails', '~>4'
 #gem 'turbolinks'
 
 gem "mysql2"
@@ -17,10 +17,10 @@ gem "oj"
 
 # https://github.com/nesquena/rabl
 # https://github.com/ccocchi/rabl-rails
-gem 'rabl-rails'
+#gem 'rabl-rails'
 
 # https://github.com/plataformatec/devise
-gem 'devise', "~> 2.2"
+gem 'devise' #, "~> 2.2"
 
 gem "omniauth"
 gem 'omniauth-oauth2'
@@ -37,7 +37,8 @@ gem "remotipart"#, "~> 1.0.2"
 gem 'acts_as_tenant'
 
 # https://github.com/sferik/rails_admin
-gem 'rails_admin'#, "~> 0.0.5"
+#gem 'rails_admin' #, "~> 0.0.6"
+gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin' #remove git reference after next version bump
 
 #https://github.com/ryanb/cancan
 gem 'cancan'
@@ -61,7 +62,8 @@ gem 'delayed_job_active_record', :git => 'git://github.com/collectiveidea/delaye
 gem "daemons"
 
 # https://github.com/cerebris/mailhopper
-gem 'mailhopper'
+#gem 'mailhopper'
+gem 'mailhopper', :git => 'git://github.com/youdonz/mailhopper', :branch => 'rails4'
 
 # https://github.com/cerebris/delayed_mailhopper
 gem 'delayed_mailhopper'
@@ -78,8 +80,8 @@ gem 'jquery-rails'
 gem 'paper_trail'
 
 # https://github.com/lucasefe/themes_for_rails
-gem "themes_for_rails", :git => 'git://github.com/tkriplean/themes_for_rails3.git'
-#gem "themes_for_rails"
+gem "themes_for_rails", :git => 'git://github.com/tkriplean/themes_for_rails.git' #, :branch => 'rails4'
+#gem "themes_for_rails", :git => "git://github.com/digitalmoksha/themes_for_rails"
 
 # https://github.com/weppos/actionmailer_with_request
 gem 'actionmailer-with-request'
@@ -100,6 +102,8 @@ gem 'dalli'
 # https://github.com/vmg/rinku
 gem 'rinku'
 
+#gem 'font-awesome-rails'
+
 #custom gems
 #gem "reflect", :path => "lib/gems/reflect"
 gem "followable", :path => "lib/gems/followable"
@@ -112,7 +116,14 @@ gem "thankable", :path => "lib/gems/thankable"
 gem 'sitemap_generator'
 
 # https://github.com/cmer/cacheable-csrf-token-rails
-gem 'cacheable-csrf-token-rails'
+#gem 'cacheable-csrf-token-rails'
+gem 'cacheable-csrf-token-rails', :git => 'git://github.com/ekampp/cacheable-csrf-token-rails'
+
+#######
+# https://github.com/rails/protected_attributes
+# These are primarily to make smooth upgrade from Rails 3 to 4
+gem 'actionpack-action_caching'
+#######
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
@@ -124,6 +135,10 @@ group :development, :test do
   gem 'thin'
   gem 'meta_request'
   gem 'newrelic_rpm'
+  gem 'guard', '>= 2.2.2',       :require => false
+  gem 'guard-livereload',        :require => false
+  gem 'rack-livereload'
+  gem 'rb-fsevent',              :require => false  
 end
 
 group :production do
@@ -132,15 +147,13 @@ group :production do
 end
 
 
-group :assets do
-  gem 'aws-sdk'
-  #gem 'sass-rails'#,   "3.2.6"
-  gem 'coffee-rails', "~> 3.2.2"
-  gem 'uglifier'
-  gem "asset_sync"
-  gem 'compass', '0.13.alpha.12'
-  gem 'compass-rails', '>= 1.0.2'
-  gem 'sassy-buttons'
-  #gem 'turbo-sprockets-rails3'
-  #gem "themes_for_rails", :git => 'git://github.com/jasherai/themes_for_rails.git'
-end
+gem 'sprockets-rails', :require => 'sprockets/railtie'
+#gem 'sprockets-helpers'
+
+gem 'aws-sdk'
+gem 'coffee-rails' #, "~> 3.2.2"
+gem 'uglifier'
+gem "asset_sync"
+gem 'compass' #, '0.13.alpha.12'
+gem 'compass-rails' #, '>= 1.0.2'
+gem 'sassy-buttons'