Use improved whitespace:scrub_gratuitous_newlines

diaspora · Sep 26, 2010 · e792344 · e792344
1 parent 4223769
commit e792344
Show file tree

Hide file tree

Showing 77 changed files with 0 additions and 97 deletions.
diff --git a/Capfile b/Capfile
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0'
 gem 'bundler', '1.0.0'
 
-
 #Security
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 

diff --git a/README.md b/README.md
@@ -32,8 +32,6 @@ We are continuing to build features and improve the code base.
 When we think it is ready for general use, we will post more final
 instructions.
 
-
-
 ## Resources
 
 We are maintaining a

diff --git a/Rakefile b/Rakefile
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1=t('.add_a_new_album')
 
 = form_for Album.new do |f|

diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 .back= link_to "⇧ #{@album.name}", @album
 %h1.big_text
 

diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   :javascript
     $(document).ready(function(){

diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $(document).ready(function(){
     $(".image_thumb img").load( function() {
@@ -25,8 +24,6 @@
     = @album.name
   ="#{t('.updated')} #{how_long_ago(@album)}"
 
-
-
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
 -unless current_user.owns? @album

diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1=t('.add_a_new_aspect')
 = form_for Aspect.new do |f|
   = f.error_messages

diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
@@ -2,11 +2,9 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   = link_to t('.photos'), albums_path(:aspect => @aspect)
 
-
 - content_for :left_pane do
   = render "shared/aspect_friends"
 

diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
@@ -29,8 +28,6 @@
 - content_for :publish do
   = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
 
-
-
 %ul#aspect_list
   - for aspect in @aspects
     %li.aspect

diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   = link_to t('.photos'), albums_path(:aspect => @aspect)
 

diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.comment{:id => post.id}
   = person_image_tag(post.person)
   %span.from

diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %div.comments
   %ul.comment_set{:id => post.id}
     - for comment in post.comments

diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for Comment.new, :remote => true do |f|
   %p
     %label{:for => "comment_text_on_#{post.id}"} Comment

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
 :javascript
   WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
@@ -29,15 +28,13 @@
         processPost(obj['class'], obj['html'], obj['aspect_ids'])
       }
 
-
     };
     ws.onclose = function() { debug("socket closed"); };
     ws.onopen = function() {
       ws.send(location.pathname);
       debug("connected...");
     };
 
-
   });
   function processRetraction(post_id){
     $('#' + post_id ).fadeOut(500, function(){

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head

diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head

diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :publish do
   %h1
     Search

diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - title=t('.new_person')
 
 = form_for @person do |f|
@@ -28,5 +27,4 @@
         = p.text_field :last_name
     = f.submit
 
-
 %p= link_to t('.back_to_list'), people_path
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   profile
 

diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   function createUploader(){
     var uploader = new qq.FileUploader({

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id}
 
   = person_image_tag(post.person)

diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1.big_text
   .back
     = link_to "⇧ #{@album.name}", album_path(@album)

diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - title t('.new_photo')
 
 = form_for( @photo, :html => {:multipart => true}) do |f|

diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $(document).keydown(function(e){
     switch(e.keyCode) {
@@ -35,7 +34,6 @@
     -if current_user.owns? @album
       = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
 
-
 %div{:id => @photo.id}
   #show_photo
     = linked_scaled_photo @photo, @album

diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #debug_info
   %h5 DEBUG INFO
   #debug_more{ :style => "display:none;" }

diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %ul
   %h3= link_to post.class, object_path(post)
   - for field in object_fields(post)

diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
@@ -1,6 +1,5 @@
 = image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
 
-
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
   %p
     = f.label :username

diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1
   =t('.add_a_new_friend_to')
   %i= aspect.name

diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #friend_pictures
   = owner_image_link
   - for friend in @friends

diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #aspect_nav
   %ul
     - for aspect in @aspects

diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
   = person_image_link(post.person)
   = yield post_yield_tag(post)

diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #publisher
   = owner_image_tag
 

diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
@@ -2,8 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-
 :javascript
   $(".reshare_button").toggle(function(e){
     e.preventDefault();

diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
@@ -2,5 +2,4 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for StatusMessage.new, :remote => true do |f|
   = f.error_messages
   %p

diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
 
   = person_image_link(post.person)

diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1.big_text status messages
 = render "status_messages/new_status_message", :status_message => @status_message
 %ul#stream

diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :publish do
   %h1="#{t('.editing_profile')}"
 

diff --git a/config.ru b/config.ru
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)

diff --git a/config/app_config.yml.example b/config/app_config.yml.example
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 default:
   pod_url: "http://example.org/"
   debug: false

diff --git a/config/deploy_config.yml b/config/deploy_config.yml
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'