From e792344c0e9d88a6eb774810f9e35d08c05cf519 Mon Sep 17 00:00:00 2001
From: Dorian <pr.dorian@gmail.com>
Date: Sun, 26 Sep 2010 11:48:19 +0200
Subject: [PATCH] Use improved whitespace:scrub_gratuitous_newlines
---
Capfile | 2 --
Gemfile | 1 -
README.md | 2 --
Rakefile | 2 --
app/views/albums/_new_album.haml | 1 -
app/views/albums/edit.html.haml | 1 -
app/views/albums/index.html.haml | 1 -
app/views/albums/show.html.haml | 3 ---
app/views/aspects/_new_aspect.haml | 1 -
app/views/aspects/index.html.haml | 2 --
app/views/aspects/manage.html.haml | 3 ---
app/views/aspects/show.html.haml | 1 -
app/views/comments/_comment.html.haml | 1 -
app/views/comments/_comments.html.haml | 1 -
app/views/comments/_new_comment.html.haml | 1 -
app/views/js/_websocket_js.haml | 3 ---
app/views/layouts/application.html.haml | 1 -
app/views/layouts/session_wall.html.haml | 1 -
app/views/people/index.html.haml | 1 -
app/views/people/new.html.haml | 2 --
app/views/people/show.html.haml | 1 -
app/views/photos/_new_photo.haml | 1 -
app/views/photos/_photo.haml | 1 -
app/views/photos/edit.html.haml | 1 -
app/views/photos/new.html.haml | 1 -
app/views/photos/show.html.haml | 2 --
app/views/posts/_debug.haml | 1 -
app/views/posts/_post.html.haml | 1 -
app/views/registrations/new.html.haml | 1 -
app/views/requests/_new_request.haml | 1 -
app/views/shared/_aspect_friends.haml | 1 -
app/views/shared/_aspect_nav.haml | 1 -
app/views/shared/_post_wrapper.haml | 1 -
app/views/shared/_publisher.haml | 1 -
app/views/shared/_reshare.haml | 2 --
app/views/shared/log.haml | 1 -
app/views/status_messages/_new_status_message.haml | 1 -
app/views/status_messages/_status_message.html.haml | 1 -
app/views/status_messages/index.html.haml | 1 -
app/views/users/edit.html.haml | 1 -
config.ru | 2 --
config/app_config.yml.example | 1 -
config/deploy_config.yml | 2 --
config/locales/devise/devise.cs.yml | 1 -
config/locales/devise/devise.cy.yml | 1 -
config/locales/devise/devise.de.yml | 1 -
config/locales/devise/devise.en.yml | 1 -
config/locales/devise/devise.fr-informal.yml | 1 -
config/locales/devise/devise.fr.yml | 1 -
config/locales/devise/devise.he.yml | 1 -
config/locales/devise/devise.it.yml | 1 -
config/locales/devise/devise.lt.yml | 1 -
config/locales/devise/devise.pl.yml | 1 -
config/locales/devise/devise.pt-BR.yml | 1 -
config/locales/devise/devise.pt-PT.yml | 1 -
config/locales/devise/devise.ro.yml | 1 -
config/locales/devise/devise.ru.yml | 1 -
config/locales/devise/devise.sv.yml | 1 -
config/locales/diaspora/cs.yml | 1 -
config/locales/diaspora/cy.yml | 1 -
config/locales/diaspora/de.yml | 1 -
config/locales/diaspora/en.yml | 1 -
config/locales/diaspora/es.yml | 1 -
config/locales/diaspora/fr-informal.yml | 1 -
config/locales/diaspora/it.yml | 1 -
config/locales/diaspora/lt.yml | 1 -
config/locales/diaspora/pl.yml | 1 -
config/locales/diaspora/pt-BR.yml | 1 -
config/locales/diaspora/pt-PT.yml | 1 -
config/locales/diaspora/ru.yml | 1 -
config/locales/diaspora/sv.yml | 1 -
config/selenium.yml | 2 --
config/sprinkle/conf/nginx.conf | 2 --
config/thin.yml | 2 --
lib/tasks/db.rake | 2 --
lib/tasks/rspec.rake | 2 --
ubuntu-setup.bash | 1 -
77 files changed, 97 deletions(-)
diff --git a/Capfile b/Capfile
index af77f235a5..306a9d64b4 100644
--- 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
index 419f75094d..7fde201c14 100644
--- 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
index 97ec668348..c8f193afed 100644
--- 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
index f00478e2e2..fa9be254a9 100644
--- 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
index daefe15f3c..e0212a6b45 100644
--- 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
index 4dfb2294ca..67cc3071d6 100644
--- 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
index af83b53ebb..2e680c1102 100644
--- 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
index 7b5e6c8be1..4c9ba19b86 100644
--- 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
index 9f0b662dd8..548abd0d1a 100644
--- 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
index 11275b6b49..ae24e8e3b7 100644
--- 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
index 043ce3308b..e08f6dabdb 100644
--- 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
index d4262f838c..ae24e8e3b7 100644
--- 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
index 2c233f1dca..03a2fcf61f 100644
--- 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
index 87e1c1db19..aecfb4bf17 100644
--- 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
index a4268082d8..99c03f8986 100644
--- 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
index 45a3586522..4677f6ce67 100644
--- 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(){
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 71976017c4..fc063e0b6a 100644
--- 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
index 5611fd4797..29b863b32d 100644
--- 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
index c8425551d2..5981569b82 100644
--- 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
index 2b635e9974..0584732bc0 100644
--- 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
index 3fc80cfd73..9b5128160e 100644
--- 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
index 7c3e7e76e3..d1a4fc73f5 100644
--- 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
index 9fadad1870..d39fd0666d 100644
--- 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
index bbaee2ef84..06556039cc 100644
--- 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
index 1fdf71a845..d8701c2651 100644
--- 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
index 08eba0c291..787f5861df 100644
--- 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
index 17d7baad83..ef1984d7d7 100644
--- 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
index 5b44932868..acad2e12be 100644
--- 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
index f837c92de2..25902720e9 100644
--- 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
index f47e473712..0dbf5b0a12 100644
--- 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
index e27bb3fdba..b4927edc6b 100644
--- 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
index 8e900e42d6..a0a0ee0ad9 100644
--- 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
index b901fc6085..956706b683 100644
--- 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
index e163a3ba02..1a440b838b 100644
--- 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
index 1861c7d277..9df1c9ce19 100644
--- 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
index 7472689e3f..bf957bf7ce 100644
--- 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
index b515dadffa..c27585f0a5 100644
--- 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
index f136a4c33c..55c5123b7f 100644
--- 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
index 42ed5fc09b..43c065380a 100644
--- 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
index 46e966f541..3385cb5eae 100644
--- 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
index cb12bcfa2b..0c65f5908b 100644
--- 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
index b2251fefc7..069823a05c 100644
--- 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
index 9bd7a6b963..6aacbf3fff 100644
--- 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'
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 34d9eb7c1e..26ff8044db 100644
--- 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:
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 2d09ac9566..d8b6d94f49 100644
--- 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:
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 82b658e993..e6608c1819 100644
--- 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:
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 8876bc5bff..7ab686bd4e 100644
--- 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:
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
index 9578af9d9a..6fe14382e3 100644
--- 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:
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index b8691eb3a3..240e9d967d 100644
--- 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:
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 851a907895..4ae726a4d7 100644
--- 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:
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 76f761e377..96044d1918 100644
--- 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:
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index d6e33c1cbe..8ae8f027b5 100644
--- 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:
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index a490a1a398..503fb6d613 100644
--- 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:
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index ba2b3b5de9..5a39a47345 100644
--- 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:
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index cf16fd20d4..c0c9555171 100644
--- 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:
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 63501ea7b6..b4d12e6b67 100644
--- 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:
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 670d570267..1ac6268618 100644
--- 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:
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index 3c41ea81b3..c83179bde9 100644
--- 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:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 91c904dc19..0f9ec4f091 100644
--- 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.
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index e0198b1b69..97b4fd3df7 100644
--- 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.
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 9c7d67f4da..dd3cead597 100644
--- 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.
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9db8087468..025aed1493 100644
--- 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.
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 1f6b6b2e75..37657e1f40 100644
--- 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.
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index 2342ff1cef..141584dad5 100644
--- 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.
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index bb44c6f27e..4730b3cea9 100644
--- 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.
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index e1a529431b..01295e3895 100644
--- 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.
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 2052779bd1..c55b796919 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.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.
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 10425864bf..aa7a7af358 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
# Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index ce3d9abbc4..6df399150c 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
# Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1b5d3b9588..cc76b9b426 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
# Sample localization file for Russian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index dfb8deb7f3..1aa9ac2dce 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
# Swedish localization file.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
diff --git a/config/selenium.yml b/config/selenium.yml
index 74ce21d73b..0d679b602e 100644
--- a/config/selenium.yml
+++ b/config/selenium.yml
@@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
common: &common
# Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists
# kill_mongrel_after_suite: true
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index eba9fa45b4..188daedcb3 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
worker_processes 1;
pid /tmp/pids/nginx.pid;
diff --git a/config/thin.yml b/config/thin.yml
index ad91436c1a..a49d85ce4e 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
rackup: /usr/local/app/diaspora/current/config.ru
pid: /tmp/pids/thin.pid
wait: 30
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 4b6202f29b..e4e379a2a2 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
namespace :db do
desc 'Seed the current RAILS_ENV database from db/seeds.rb'
namespace :seed do
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 35f0b8a98f..54442d71ea 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
begin
require 'rspec/core'
require 'rspec/core/rake_task'
diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index 117a78ed90..83c779b0c6 100755
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -8,7 +8,6 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
# Set extented globbing
shopt -s extglob
--
GitLab