Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

app/controllers/albums_controller.rb

@@ -12,7 +12,8 @@ class AlbumsController < ApplicationController
       flash[:notice] = "Successfully created album."
       redirect_to @album
     else
-      render :action => 'new'
+      flash[:error] = "Successfully failed."
+      redirect_to albums_path
     end
   end
   

app/views/albums/new.html.haml

@@ -1,14 +0,0 @@
-%h1.big_text
-  =link_to 'albums', albums_path
-  >>
-  new album
-
-= form_for @album do |f|
-  = f.error_messages
-  %p
-    = f.label :name
-    = f.text_field :name
-  %p
-    = f.submit
-
-%p= link_to "Back to List", albums_path