0
@@ -85,8 +85,7 @@ class UsersController < ApplicationController
0
         flash[:success] = "Your password has been changed."
0
       end
0
     else
0
-      error_msg = ""
0
-      error_msg << "<ul class='error'>"
0
+      error_msg = "<ul class='error'>"
0
       @user.errors.each do |key, error|
0
         error_msg << "<li>#{key.capitalize} Field: #{error}</li>"
0
       end
0
@@ -98,7 +97,6 @@ class UsersController < ApplicationController
0
     render :partial => "users/parts/ajax_result.html.haml", :locals => {:message => (flash[:error] || flash[:success])}
0
     flash.discard
0
   end
0
-
0
   
0
   def spammer
0
     spammer = User.find(params[:id])

0
@@ -11,11 +11,11 @@ set :deploy_via, :remote_cache
0
 
0
 # set the list of config files to symlink on deployment
0
 set :linked_files, [
0
-                  "config/database.yml",
0
-                  "config/app_config.yml",
0
-                  "config/environments/production.yml",
0
-                  "app/views/pages/about.html.haml"
0
-                 ]
0
+                     "config/database.yml",
0
+                     "config/app_config.yml",
0
+                     "config/environments/production.yml",
0
+                     "app/views/pages/about.html.haml"
0
+                   ]
0
 
0
 # set the list of folders to symlink on deployment
0
 set :linked_folders, %w[public/screenshots public/downloads]

0
@@ -28,9 +28,6 @@ ActionController::Routing::Routes.draw do |map|
0
   map.bookmarks "/bookmarks", :controller => "projects", :action => "bookmarks"
0
   map.about "/about", :controller => "pages", :action => "about"
0
   map.blog "/blog", :controller => "pages", :action => "blog"
0
-  # blog
0
-  # map.blog "/blog", :controller => "blog", :action => "index"
0
-  # map.blog_post "/blog/:id", :controller => "blog", :action => "show"
0
 
0
   # email campaign routes
0
   map.email_unsubscribed "/unsubscribed", :controller => "pages", :action => "unsubscribed"