Skip to content

Commit

Permalink
Normalizing final new lines (decidim#1744)
Browse files Browse the repository at this point in the history
* Enfore line ending config inside project

* Ammend all missing final new lines

I used the following script

```bash
for file in $(git grep --cached -Il '' | grep -v /vendor/)
do
  if [ -n "$(tail -c 1 < "$file")" ]
  then
    echo >> "$file"
  fi
done

```

* Add an editorconfig file

To try to minimize diff noise caused by different editors.
  • Loading branch information
deivid-rodriguez authored and josepjaume committed Aug 16, 2017
1 parent f5d6698 commit 532e149
Show file tree
Hide file tree
Showing 182 changed files with 191 additions and 180 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Expand Up @@ -2,4 +2,4 @@
.byebug_history
pkg/
.git
.github
.github
9 changes: 9 additions & 0 deletions .editorconfig
@@ -0,0 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
2 changes: 2 additions & 0 deletions .gitattributes
@@ -1 +1,3 @@
* text=auto
*/vendor/* -text
bundle.js binary
2 changes: 1 addition & 1 deletion .yardopts
Expand Up @@ -5,4 +5,4 @@ app/**/*.rb
lib/**/*.rb
docs/*.md
README.md
LICENSE-AGPLv3.txt
LICENSE-AGPLv3.txt
Expand Up @@ -2,4 +2,4 @@
td:first-child{
padding-left: 20px
}
}
}
Expand Up @@ -33,4 +33,4 @@ body.login{
padding: $global-padding;
}
}
}
}
Expand Up @@ -9,4 +9,4 @@

.icon--move {
vertical-align: middle;
}
}
Expand Up @@ -16,4 +16,4 @@

.text-info{
color: $secondary;
}
}
Expand Up @@ -24,4 +24,4 @@
right: 4px;
}
}
}
}
Expand Up @@ -5,4 +5,4 @@
&.is-expanded{
display: block;
}
}
}
Expand Up @@ -17,4 +17,4 @@
<%= select :category, :parent_id, @form.parent_categories.collect { |c| [c.name[current_organization.default_locale], c.id] }, include_blank: true %>
</div>
</div>
</div>
</div>
Expand Up @@ -12,4 +12,4 @@
<div class="button--double form-general-submit">
<%= f.submit t(".impersonate") %>
</div>
<% end %>
<% end %>
Expand Up @@ -44,4 +44,4 @@
<%= f.submit t(".create") %>
</div>
<% end %>
<% end %>
<% end %>
Expand Up @@ -18,4 +18,4 @@
<div class="button--double form-general-submit">
<%= f.submit t(".promote") %>
</div>
<% end %>
<% end %>
Expand Up @@ -35,4 +35,4 @@
</div>
</div>
</div>
</div>
</div>
Expand Up @@ -4,4 +4,4 @@
<div class="button--double form-general-submit">
<%= f.submit t(".update") %>
</div>
<% end %>
<% end %>
Expand Up @@ -4,4 +4,4 @@
</div>
<div class="row column">
<%= form.translated :text_field, :plural %>
</div>
</div>
Expand Up @@ -10,4 +10,4 @@
<div class="button--double form-general-submit">
<%= f.submit t(".update") %>
</div>
<% end %>
<% end %>
Expand Up @@ -10,4 +10,4 @@
<div class="columns xlarge-6">
<%= form.collection_select :scope_type_id, organization_scope_types, :id, :name %>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion decidim-admin/app/views/decidim/admin/scopes/edit.html.erb
Expand Up @@ -10,4 +10,4 @@
<div class="button--double form-general-submit">
<%= f.submit t(".update") %>
</div>
<% end %>
<% end %>
Expand Up @@ -11,4 +11,4 @@
<%= render "layouts/decidim/admin/application" do %>
<%= yield %>
<% end %>
<% end %>
Expand Up @@ -11,4 +11,4 @@
<%= render "layouts/decidim/admin/application" do %>
<%= yield %>
<% end %>
<% end %>
Expand Up @@ -11,4 +11,4 @@
<%= render "layouts/decidim/admin/application" do %>
<%= yield %>
<% end %>
<% end %>
Expand Up @@ -19,4 +19,4 @@
<%= render "layouts/decidim/admin/application" do %>
<%= yield %>
<% end %>
<% end %>
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/ca.yml
Expand Up @@ -636,4 +636,4 @@ ca:
time:
formats:
datepicker: "%m/%d/%Y"
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/es.yml
Expand Up @@ -636,4 +636,4 @@ es:
time:
formats:
datepicker: "%m/%d/%Y"
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/eu.yml
Expand Up @@ -561,4 +561,4 @@ eu:
time:
formats:
datepicker: "%Y / %m / %d"
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/fi.yml
Expand Up @@ -403,4 +403,4 @@ fi:
none: Ei ryhmää
time:
formats:
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/fr.yml
Expand Up @@ -525,4 +525,4 @@ fr:
time:
formats:
datepicker: "%m / %j / %A"
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/it.yml
Expand Up @@ -466,4 +466,4 @@ it:
settings:
title: Impostazioni
users:
title: Utenti
title: Utenti
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/nl.yml
Expand Up @@ -5,4 +5,4 @@ nl:
description: Beschrijving
time:
formats:
timepicker: "%d/%m/%Y %H:%M"
timepicker: "%d/%m/%Y %H:%M"
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/pl.yml
Expand Up @@ -4,4 +4,4 @@ pl:
category:
name: Nazwa
feature:
name: Nazwa
name: Nazwa
@@ -1 +1 @@
@import "budget/*";
@import "budget/*";
Expand Up @@ -11,4 +11,4 @@
<button data-close class="button expanded"><%= t('.ok') %></button>
</div>
</div>
</div>
</div>
Expand Up @@ -15,4 +15,4 @@
<div class="filters">
<%= render partial: "filters" %>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/ca.yml
Expand Up @@ -127,4 +127,4 @@ ca:
project_proposals: 'Propostes incloses en aquest projecte:'
index:
confirmed_orders_count: Nombre de vots
total_budget: Pressupost total
total_budget: Pressupost total
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/es.yml
Expand Up @@ -127,4 +127,4 @@ es:
project_proposals: 'Propuestas incluidas en este proyecto:'
index:
confirmed_orders_count: Número de votos
total_budget: Presupuesto total
total_budget: Presupuesto total
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/eu.yml
Expand Up @@ -127,4 +127,4 @@ eu:
project_proposals: 'Proiektu honetan jasotako proposamenak:'
index:
confirmed_orders_count: Boto-kopurua
total_budget: Guztizko aurrekontua
total_budget: Guztizko aurrekontua
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/fi.yml
Expand Up @@ -117,4 +117,4 @@ fi:
success: Äänesi on peruttu onnistuneesti
index:
confirmed_orders_count: Tilauksien määrä
total_budget: Koko budjetti
total_budget: Koko budjetti
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/fr.yml
Expand Up @@ -126,4 +126,4 @@ fr:
project_proposals: 'Propositions incluses dans ce projet:'
index:
confirmed_orders_count: Nombre de votes comptés
total_budget: Budget total
total_budget: Budget total
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/it.yml
Expand Up @@ -123,4 +123,4 @@ it:
project_proposals: 'Proposte incluse in questo progetto:'
index:
confirmed_orders_count: Conteggio ordini
total_budget: Budget totale
total_budget: Budget totale
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/nl.yml
Expand Up @@ -2,4 +2,4 @@ nl:
activemodel:
attributes:
project:
description: Beschrijving
description: Beschrijving
2 changes: 1 addition & 1 deletion decidim-budgets/config/locales/pl.yml
Expand Up @@ -2,4 +2,4 @@ pl:
decidim:
budgets:
actions:
new: Nowy
new: Nowy
@@ -1,4 +1,4 @@
fragment AddCommentFormCommentable on Commentable {
id
type
}
}
Expand Up @@ -3,4 +3,4 @@ fragment AddCommentFormSession on Session {
id
name
}
}
}
Expand Up @@ -11,4 +11,4 @@ fragment Comment on Comment {
}
}
}
}
}
Expand Up @@ -20,4 +20,4 @@ fragment CommentData on Comment {
alreadyReported
...UpVoteButton
...DownVoteButton
}
}
Expand Up @@ -3,4 +3,4 @@
fragment CommentThread on Comment {
hasComments
...Comment
}
}
Expand Up @@ -3,4 +3,4 @@ fragment DownVoteButton on Comment {
downVotes
downVoted
upVoted
}
}
Expand Up @@ -3,4 +3,4 @@ fragment UpVoteButton on Comment {
upVotes
upVoted
downVoted
}
}
Expand Up @@ -6,4 +6,4 @@ mutation addComment($commentableId: String!, $commentableType: String!, $body: S
...CommentThread
}
}
}
}
Expand Up @@ -6,4 +6,4 @@ mutation DownVote($id: ID!) {
...Comment
}
}
}
}
Expand Up @@ -6,4 +6,4 @@ mutation UpVote($id: ID!) {
...Comment
}
}
}
}
Expand Up @@ -20,4 +20,4 @@ query GetComments($commentableId: String!, $commentableType: String!, $orderBy:
}
...AddCommentFormCommentable
}
}
}
Expand Up @@ -15,4 +15,4 @@

<p>
<%= t("decidim.comments.comment_notification_mailer.manage_email_subscriptions_html", link: link_to(t("decidim.comments.comment_notification_mailer.notifications_settings_link"), decidim.notifications_settings_url(host: @organization.host))) %>
</p>
</p>
2 changes: 1 addition & 1 deletion decidim-comments/config/locales/ca.yml
Expand Up @@ -70,4 +70,4 @@ ca:
loading: Carregant els comentaris ...
title: "%{count} comentaris"
featured_comment:
title: Comentari destacat
title: Comentari destacat
2 changes: 1 addition & 1 deletion decidim-comments/config/locales/es.yml
Expand Up @@ -70,4 +70,4 @@ es:
loading: Cargando los comentarios ...
title: "%{count} comentarios"
featured_comment:
title: Comentario destacado
title: Comentario destacado

0 comments on commit 532e149

Please sign in to comment.