Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/dev_utilities_controller.rb

@@ -62,8 +62,11 @@ def warzombie
     
     backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
     username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
+    
+    @fixture_name = File.dirname(__FILE__) + "../../../public/images/users/#{username}.jpg"
+
     photo = current_user.post(:photo, :album_id => album.id,
-                      :user_file => "public/images/users/#{username}.jpg") 
+                      :user_file => "") 
    
     current_user.update_profile(:image_url => photo.url)
   end

app/controllers/status_messages_controller.rb

@@ -6,17 +6,12 @@ class StatusMessagesController < ApplicationController
     @status_message = current_user.post(:status_message, params[:status_message])
     
     if @status_message.created_at
-      flash[:notice] = "Successfully created status message."
       render :nothing => true
     else
-      render :action => 'new'
+      redirect_to root_url
     end
   end
   
-  def new
-    @status_message = StatusMessage.new
-  end
-  
   def destroy
     @status_message = StatusMessage.where(:id => params[:id]).first
     @status_message.destroy

app/views/status_messages/new.html.haml

@@ -1,13 +0,0 @@
-- title "New Status Message"
-
-= form_for @status_message, :remote => true do |f|
-  = f.error_messages
-  %p
-    = f.label :message
-    %br
-    = f.text_field :message
-  %p
-    = f.submit
-
-
-%p= link_to "Back to List", status_messages_path

config/app_config.yml

@@ -1,6 +1,6 @@
 development:
   debug: false
-  socket_debug : true
+  socket_debug : false
   socket_port: 8080
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 

config/routes.rb

@@ -1,7 +1,7 @@
 Diaspora::Application.routes.draw do
   resources :people, :only => [:index, :show, :destroy]
   resources :users, :except => [:create, :new]
-  resources :status_messages, :except => [:index]
+  resources :status_messages, :only => [:create, :destroy, :show]
   resources :comments, :except => [:index]
   resources :requests, :except => [:edit, :update]
   resources :photos, :except => [:index]