fix readme and remove whitespacetrailing

4 files changed, 15 insertions, 15 deletions

diff --git a/app/controllers/inboxes/base_controller.rb b/app/controllers/inboxes/base_controller.rb
index 680e38c..f1e77b1 100644
--- a/app/controllers/inboxes/base_controller.rb
+++ b/app/controllers/inboxes/base_controller.rb
@@ -1,10 +1,10 @@
 class Inboxes::BaseController < ApplicationController
   private
-  
+
   def init_discussion
     @discussion = Discussion.find(params[:discussion_id])
   end
-  
+
   # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
   def current_ability
     # raise "Loading Ability"
diff --git a/app/controllers/inboxes/discussions_controller.rb b/app/controllers/inboxes/discussions_controller.rb
index c03a062..04a8edd 100644
--- a/app/controllers/inboxes/discussions_controller.rb
+++ b/app/controllers/inboxes/discussions_controller.rb
@@ -3,7 +3,7 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   # before_filter :authenticate_user!
   # before_filter :init_and_check_permissions, :only => :show
   before_filter :load_and_check_discussion_recipient, :only => [:create, :new]
-  
+
   def index
     @discussions = current_user.discussions
   end
@@ -21,37 +21,37 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
     # @discussion = Discussion.new
     @discussion.messages.build
   end
-  
+
   # POST /discussions
   # POST /discussions.json
   def create
     # @discussion = Discussion.new(params[:discussion])
     @discussion.add_recipient_token current_user.id
-    
+
     @discussion.messages.each do |m|
       m.discussion = @discussion
       m.user = current_user
     end
-    
+
     if @discussion.save
       redirect_to @discussion, :notice => t("inboxes.discussions.started")
     else
       render :action => "new"
     end
   end
-  
+
   private
-  
+
   # def init_and_check_permissions
   #   @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
   #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
   # end
-  
+
   def load_and_check_discussion_recipient
     # initializing model for new and create actions
     @discussion = Discussion.new(params[:discussion].presence || {})
     # @discussion.recipient_tokens = params[:recipients] if params[:recipients] # pre-population
-    
+
     # checking if discussion with this user already exists
     if @discussion.recipient_ids && @discussion.recipient_ids.size == 1
       user = User.find(@discussion.recipient_ids.first)
diff --git a/app/controllers/inboxes/messages_controller.rb b/app/controllers/inboxes/messages_controller.rb
index 4089b13..697592a 100644
--- a/app/controllers/inboxes/messages_controller.rb
+++ b/app/controllers/inboxes/messages_controller.rb
@@ -3,12 +3,12 @@ class Inboxes::MessagesController < Inboxes::BaseController
   # load_and_authorize_resource
   load_and_authorize_resource :discussion
   load_resource :message, :through => :discussion, :shallow => true
-  
+
   def create
     @message.user = current_user
     @message.discussion = @discussion
     @message.save
-    
+
     respond_to do |format|
       format.html { redirect_to @message.discussion }
       format.js
@@ -16,7 +16,7 @@ class Inboxes::MessagesController < Inboxes::BaseController
   end
 
   # private
-  # 
+  #
   # def init_and_check_permissions
   #   @discussion = Discussion.find(params[:discussion_id])
   #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
diff --git a/app/controllers/inboxes/speakers_controller.rb b/app/controllers/inboxes/speakers_controller.rb
index 96a3049..30c0b7f 100644
--- a/app/controllers/inboxes/speakers_controller.rb
+++ b/app/controllers/inboxes/speakers_controller.rb
@@ -3,14 +3,14 @@ class Inboxes::SpeakersController < Inboxes::BaseController
   load_and_authorize_resource :discussion
   load_resource :speaker, :through => :discussion, :shallow => true
   # load_and_authorize_resource
-  
+
   def create
     raise ActiveRecord::RecordNotFound unless params[:speaker] && params[:speaker][:user_id]
     @user = User.find(params[:speaker][:user_id])
     flash[:notice] = t("inboxes.speakers.added") if @discussion.add_speaker(@user)
     redirect_to @discussion
   end
-  
+
   def destroy
     @speaker = Speaker.find(params[:id])
     @speaker.destroy