cap deploy fix

Author: dynamicguy

Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '4-0-stable'
 gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
@@ -55,12 +55,16 @@ group :assets do
 
   # CSS
   # Use SCSS for stylesheets
-  gem 'less-rails'
+  #gem 'less-rails'
+
+  gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
+  gem 'bootstrap-sass', '~> 3.0.0.0.rc'
+
   gem 'uglifier', '>= 1.3.0'
   gem 'coffee-rails', '~> 4.0.0'
 
   #gem 'bootstrap-sass'
-  gem "compass-rails", "~> 2.0.alpha.0"
+  #gem "compass-rails", "~> 2.0.alpha.0"
 
   # JavaScript
   #gem 'handlebars_assets', '>= 0.12.0'
@@ -70,9 +74,7 @@ group :assets do
   # install Node.js or use 'therubyracer'.
   #
   # See git://github.com/sstephenson/execjs#readme for more supported runtimes
-
   gem 'therubyracer', :platform => :ruby
-
 end
 
 # Build JSON APIs with ease. Read more: git://github.com/rails/jbuilder
@@ -172,9 +174,6 @@ gem "js-routes"
 gem 'responders'
 gem 'paginate-responder'
 
-gem 'rails_admin', git: 'git://github.com/sferik/rails_admin.git'
-gem 'rails_admin_tag_list'
-
 # we don't install these on travis to speed up test runs
 group :production do
   # Administration
@@ -217,7 +216,7 @@ group :development do
   #gem 'growl', require: darwin_only('growl')
   #gem 'rb-inotify', require: linux_only('rb-inotify')
 
-  gem 'capistrano', '2.15.5'
+  gem 'capistrano', '2.15.4'
   gem 'capistrano-ext', '1.2.1'
   gem 'meta_request'
 
@@ -312,6 +311,9 @@ group :development, :test do
 
 end
 
+#gem 'rails_admin', git: 'git://github.com/sferik/rails_admin.git', :branch => 'master'
+#gem 'rails_admin_tag_list'
+
 # perftools only works on 1.9 atm
 group :profile do
   # travis refuses to install this, instead of fuffing, just avoid it for now

Gemfile.lock

@@ -113,13 +113,13 @@ GIT
 
 GIT
   remote: git://github.com/paulelliott/fabrication.git
-  revision: eec320b47fd9c57d56d76f748c186901e63f2b1d
+  revision: 2ec9f63d4db3ae6553f531227ab71d0ebea02973
   specs:
     fabrication (2.8.1)
 
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: 5cb575bd48e61b2612a533635c7615bca762d63c
+  revision: 69d28f9b0e8150aaec9f3175ddd8d1a20af0633a
   specs:
     devise (3.1.0)
       bcrypt-ruby (~> 3.0)
@@ -192,26 +192,6 @@ GIT
     jquery-datatables-rails (1.11.2)
       jquery-rails
 
-GIT
-  remote: git://github.com/sferik/rails_admin.git
-  revision: c51b824c6ede9e1f023c171d644c7fab0002e239
-  specs:
-    rails_admin (0.5.0)
-      bootstrap-sass (~> 2.3)
-      builder (~> 3.1)
-      coffee-rails (~> 4.0)
-      font-awesome-rails (~> 3.0)
-      haml (~> 4.0)
-      jquery-rails (~> 3.0)
-      jquery-ui-rails (~> 4.0)
-      kaminari (~> 0.14)
-      nested_form (~> 0.3)
-      rack-pjax (~> 0.7)
-      rails (~> 4.0.0)
-      remotipart (~> 1.0)
-      safe_yaml (~> 0.9)
-      sass-rails (~> 4.0)
-
 GIT
   remote: git://github.com/sporkrb/spork-rails.git
   revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e
@@ -228,7 +208,7 @@ GIT
       rails (>= 3.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionpack-action_caching (1.0.0)
       actionpack (>= 4.0.0.beta, < 5.0)
@@ -256,7 +236,7 @@ GEM
       daemons (~> 1.1.4)
       i18n (>= 0.5.0)
       state_machine (~> 1.1)
-    bootstrap-sass (2.3.2.2)
+    bootstrap-sass (3.0.0.0.rc2)
       sass (~> 3.2)
     buff-config (0.4.0)
       buff-extensions (~> 0.3)
@@ -271,7 +251,7 @@ GEM
       uniform_notifier
     callsite (0.0.11)
     cancan (1.6.10)
-    capistrano (2.15.5)
+    capistrano (2.15.4)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -311,7 +291,6 @@ GEM
       yajl-ruby (~> 1.1)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.2.9)
     coderay (1.0.9)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -322,13 +301,6 @@ GEM
     coffee-script-source (1.6.3)
     commands (0.2.1)
       rails (>= 3.2.0)
-    commonjs (0.2.7)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    compass-rails (2.0.alpha.0)
-      compass (>= 0.12.2, < 0.14)
     configurate (0.0.8)
     connection_pool (1.1.0)
     country_select (1.2.0)
@@ -398,14 +370,13 @@ GEM
       nokogiri (~> 1.5)
       ruby-hmac
       unicode (~> 0.4.4)
-    font-awesome-rails (3.2.1.3)
+    font-awesome-rails (4.0.0.0)
       railties (>= 3.2, < 5.0)
     foreman (0.62.0)
       thor (>= 0.13.6)
     formatador (0.2.4)
     friendly_id (5.0.0)
       activerecord (~> 4.0.0)
-    fssm (0.2.10)
     fuubar (1.1.1)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -458,24 +429,14 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.0)
-      railties (>= 3.1.0)
     js-routes (0.9.4)
       rails (>= 3.2)
     json (1.7.7)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
     kgio (2.8.1)
     launchy (2.3.0)
       addressable (~> 2.3)
-    less (2.4.0)
-      commonjs (~> 0.2.7)
-    less-rails (2.4.2)
-      actionpack (>= 3.1)
-      less (~> 2.4.0)
     letter_opener (1.1.2)
       launchy (~> 2.2)
     libv8 (3.16.14.3)
@@ -523,7 +484,6 @@ GEM
     multi_test (0.0.2)
     multipart-post (1.2.0)
     mysql2 (0.3.13)
-    nested_form (0.3.2)
     net-http-persistent (2.9)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
@@ -623,9 +583,6 @@ GEM
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-piwik (0.2.2)
-    rack-pjax (0.7.0)
-      nokogiri (~> 1.5)
-      rack (~> 1.3)
     rack-protection (1.5.0)
       rack
     rack-rewrite (1.3.3)
@@ -638,9 +595,6 @@ GEM
       rails (~> 4.0.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    rails_admin_tag_list (0.1.5)
-      rails (>= 3.1)
-      rails_admin (>= 0.0.1)
     rails_autolink (1.1.0)
       rails (> 3.1)
     raindrops (0.12.0)
@@ -772,7 +726,7 @@ GEM
     slop (3.4.6)
     solve (0.8.1)
     sorcerer (1.0.2)
-    spork (1.0.0rc3)
+    spork (1.0.0rc4)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -784,13 +738,14 @@ GEM
       sprockets (~> 2.8)
     state_machine (1.2.0)
     subexec (0.2.3)
-    sunspot (2.0.0)
+    sunspot (2.1.0)
       pr_geohash (~> 1.0)
       rsolr (~> 1.0.7)
-    sunspot_rails (2.0.0)
+    sunspot_rails (2.1.0)
       nokogiri
-      sunspot (= 2.0.0)
-    sunspot_solr (2.0.0)
+      rails (>= 3)
+      sunspot (= 2.1.0)
+    sunspot_solr (2.1.0)
     sunspot_test (0.4.0)
       sunspot_rails (>= 1.2.1)
     systemu (2.5.2)
@@ -862,16 +817,16 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bluepill
+  bootstrap-sass (~> 3.0.0.0.rc)
   bullet
   cancan
-  capistrano (= 2.15.5)
+  capistrano (= 2.15.4)
   capistrano-ext (= 1.2.1)
   capybara
   carrierwave
   certified
   coffee-rails (~> 4.0.0)
   commands
-  compass-rails (~> 2.0.alpha.0)
   configurate
   country_select
   cucumber-rails
@@ -906,7 +861,6 @@ DEPENDENCIES
   jquery-rails (~> 3.0)
   js-routes
   knife-solo!
-  less-rails
   letter_opener
   listen
   lru_redux
@@ -949,8 +903,6 @@ DEPENDENCIES
   rails!
   rails-i18n (~> 4.0.0.pre)
   rails-observers
-  rails_admin!
-  rails_admin_tag_list
   rails_autolink (= 1.1.0)
   rake (= 10.1.0)
   rb-fsevent
@@ -966,6 +918,7 @@ DEPENDENCIES
   rspec-instafail (= 0.2.4)
   rspec-rails
   ruby-oembed (= 0.8.8)
+  sass-rails (>= 3.2)
   seed-fu!
   shoulda
   sidekiq

app/assets/images/check.png

@@ -14,6 +14,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require turbolinks
+#= require bootstrap
 #= require pace/pace
 #= require bootbox/bootbox
 #= require noty/js/noty/jquery.noty
@@ -23,7 +24,6 @@
 #= require underscore-amd/underscore
 #= require backbone-amd/backbone
 #= require backbone.marionette/lib/backbone.marionette
-#= require bootstrap/dist/js/bootstrap
 #= require backbone.syphon/lib/backbone.syphon
 #= require backbone-pageable/lib/backbone-pageable
 #= require backgrid/lib/backgrid

app/assets/images/navy_blue.png

@@ -5,7 +5,7 @@
     <div class="carbonad">
         <div class="media">
             <a class="pull-left" href="#">
-                <img class="media-object img-thumbnail" src="/assets/trending.png" alt="...">
+                <img class="media-object" src="/dev-assets/trending.png" alt="...">
             </a>
             <div class="media-body">
                 <h4 class="media-heading">Now Trending</h4>

app/assets/javascripts/application.js.coffee

@@ -1,8 +1,10 @@
 @charset "UTF-8";
-@import "bootstrap/less/bootstrap";
+
+@import "bootstrap";
+@import "bootstrap/theme";
 @import "backgrid/lib/backgrid.css";
 @import "pace/themes/pace-theme-flash.css";
-@import "font-awesome.css";
+
 
 @import "theme";
 @import "main";

app/assets/javascripts/backbone/apps/header/list/templates/_title.jst.eco

@@ -1,4 +1,3 @@
-
 html,
 body {
   height: 100%;
@@ -10,7 +9,7 @@ body {
 }
 
 body {
-  background: #e9e9e9 url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22x%20x-first%20x-last%22%3E/assets/%3C/span%3Etiny_grid.png%3C/span%3E) repeat 0 0;
+  background: #e9e9e9 url(http://github.com/%3Cspan%20class=%22pl-k%20x%20x-first%22%3E<%=%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3E%20asset_path%20'%3C/span%3Etiny_grid.png%3Cspan%20class=%22x%20x-first%22%3E'%20%3C/span%3E%3Cspan%20class=%22pl-k%20x%20x-last%22%3E%>%3C/span%3E%3Cspan%20class=%22pl-en%22%3E%3C/span%3E%3Cspan%20class=%22pl-s%22%3E%3C/span%3E) repeat 0 0;
   padding-bottom: 70px;
   margin: 0;
   line-height: 1.8em;
@@ -23,7 +22,7 @@ body {
   /* Negative indent footer by its height */
   margin: 0 auto -110px;
   /* Pad bottom by footer height */
-  padding: 0 0 60px;
+  padding: 0 0 65px;
 }
 
 /* Set the fixed height of the footer here */
@@ -116,11 +115,11 @@ tr.warning th {
 
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
-  color: #463265;
+  color: #5f5f5f;
 }
 
 .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus {
-  background-color: #463265;
+  background-color: #5f5f5f;
 }
 
 .page-header {
@@ -131,7 +130,7 @@ tr.warning th {
 
 .panel-title > a:hover {
   text-decoration: none;
-  color: #463265;
+  color: #5f5f5f;
 }
 
 .modal-open .navbar-fixed-top, .modal-open .navbar-fixed-bottom {