Use improved whitespace:scrub_gratuitous_newlines

e792344c · Dorian · Stephen Caudill · 4223769d · e792344c · e792344c
Commit e792344c authored Sep 26, 2010 by Dorian Committed by Stephen Caudill Sep 26, 2010
77 changed files
--- 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) }


--- 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'


--- 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

--- 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.


--- 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|

--- 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


--- 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(){

--- 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

--- 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

--- 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"


--- 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

--- 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)


--- 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

--- 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

--- 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

--- 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,7 +28,6 @@
        processPost(obj['class'], obj['html'], obj['aspect_ids'])
      }

-
    };
    ws.onclose = function() { debug("socket closed"); };
    ws.onopen = function() {
@@ -37,7 +35,6 @@
      debug("connected...");
    };

-
  });
  function processRetraction(post_id){
    $('#' + post_id ).fadeOut(500, function(){

--- 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

--- 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

--- 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

--- 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
--- 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


--- 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({

--- 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)

--- 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)

--- 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|

--- 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

--- 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;" }

--- 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)

--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
 = 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

--- 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

--- 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

--- 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

--- 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)

--- 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


--- 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();

--- 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
--- 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

--- 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)

--- 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

--- 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')}"


--- 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__)

--- 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

--- 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'

--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 cs:
  errors:
    messages:

--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 cy:
  errors:
    messages:

--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 de:
  errors:
    messages:

--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 en:
  errors:
    messages:

--- a/config/locales/devise/devise.fr-informal.yml
+++ b/config/locales/devise/devise.fr-informal.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 fr-informal:
  errors:
    messages:

--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 fr:
  errors:
    messages:

--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 en:
  errors:
    messages:

--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 it:
  errors:
    messages:

--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 lt:
  errors:
    messages:

--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 pl:
  errors:
    messages:

--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 pt-BR:
  errors:
    messages:

--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 pt-PT:
  errors:
    messages:

--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 ro:
  errors:
    messages:

--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 ru:
  errors:
    messages:

--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 sv:
  errors:
    messages:

--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Localization file for German. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for Italian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.


--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

-
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.