nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-14 15:42:49 -07:00
commit b9d28f6d21
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery :except => :receive protect_from_forgery :except => :receive
before_filter :set_friends_and_status before_filter :set_friends_and_status, :except => [:create, :update]
before_filter :count_requests before_filter :count_requests
layout :layout_by_resource layout :layout_by_resource

2
app/controllers/aspects_controller.rb
View file

@ -31,7 +31,7 @@ class AspectsController < ApplicationController
def create def create
@aspect = current_user.aspect params[:aspect] @aspect = current_user.aspect params[:aspect]
flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect." flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
respond_with :location => edit_aspect_path(@aspect) respond_with :location => aspects_manage_path
end end
def new def new