Remove trailing whitespaces and trailing lines

app/views/merge_requests/_commits.html.haml

@@ -1,28 +1,28 @@
-- unless @commits.empty? 
+- unless @commits.empty?
   .ui-box
     %h5 Commits (#{@commits.count})
     .merge-request-commits
       - if @commits.count > 8
         %ul.first_mr_commits.unstyled
-          - @commits.first(8).each do |commit| 
+          - @commits.first(8).each do |commit|
             = render "commits/commit", :commit => commit
-          %li.bottom 
+          %li.bottom
             8 of #{@commits.count} commits displayed.
-            %strong 
+            %strong
               = link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
         %ul.all_mr_commits.hide.unstyled
-          - @commits.each do |commit| 
+          - @commits.each do |commit|
             = render "commits/commit", :commit => commit
 
-      - else 
+      - else
         %ul.unstyled
-          - @commits.each do |commit| 
+          - @commits.each do |commit|
             = render "commits/commit", :commit => commit
 
-- else 
+- else
   %h5
-    Nothing to merge from 
-    %span.label #{@merge_request.source_branch} 
-    to 
+    Nothing to merge from
+    %span.label #{@merge_request.source_branch}
+    to
     %span.label #{@merge_request.target_branch}
   %br

app/views/merge_requests/_diffs.html.haml

@@ -1,3 +1,3 @@
 = render "commits/diffs", :diffs => @diffs
-- if @diffs.empty? 
+- if @diffs.empty?
   %p.cgray Nothing to merge

app/views/merge_requests/_form.html.haml

@@ -25,10 +25,10 @@
   .form-actions
     = f.submit 'Save', :class => "btn-primary btn"
     - if @merge_request.new_record?
-      = link_to project_merge_requests_path(@project), :class => "btn" do 
+      = link_to project_merge_requests_path(@project), :class => "btn" do
         Cancel
-    - else    
-      = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do 
+    - else
+      = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
         Cancel
 
 
@@ -41,11 +41,11 @@
 
 
 
-    $("#merge_request_source_branch").live("change", function() { 
+    $("#merge_request_source_branch").live("change", function() {
       $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
     });
 
-    $("#merge_request_target_branch").live("change", function() { 
+    $("#merge_request_target_branch").live("change", function() {
       $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
     });
   });

app/views/merge_requests/_head.html.haml

@@ -1,5 +1,5 @@
 .top-tabs
-  = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do 
-    %span 
-    Merge Requests  
+  = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
+    %span
+    Merge Requests
 

app/views/merge_requests/index.html.haml

@@ -1,7 +1,7 @@
 %h3
   Merge Requests
   - if can? current_user, :write_issue, @project
-    = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do 
+    = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
       New Merge Request
 
 %br
@@ -10,16 +10,16 @@
   .title
     %ul.nav.nav-pills
       %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
-        = link_to project_merge_requests_path(@project, :f => 0) do 
+        = link_to project_merge_requests_path(@project, :f => 0) do
           Open
       %li{:class => ("active" if params[:f] == "2")}
-        = link_to project_merge_requests_path(@project, :f => 2) do 
+        = link_to project_merge_requests_path(@project, :f => 2) do
           Closed
       %li{:class => ("active" if params[:f] == "3")}
-        = link_to project_merge_requests_path(@project, :f => 3) do 
+        = link_to project_merge_requests_path(@project, :f => 3) do
           To Me
       %li{:class => ("active" if params[:f] == "1")}
-        = link_to project_merge_requests_path(@project, :f => 1) do 
+        = link_to project_merge_requests_path(@project, :f => 1) do
           All
 
   %ul.unstyled

app/views/merge_requests/show.html.haml

@@ -9,7 +9,7 @@
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
-        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do 
+        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
           %i.icon-edit
           Edit
 
@@ -19,7 +19,7 @@
 
 = render "merge_requests/how_to_merge"
 .back_link
-  = link_to project_merge_requests_path(@project) do 
+  = link_to project_merge_requests_path(@project) do
     ← To merge requests
 
 .main_box
@@ -27,17 +27,17 @@
     %h4
       - if @merge_request.closed
         .alert-message.error.status_info Closed
-      - else 
+      - else
         .alert-message.success.status_info Open
       = @merge_request.title
 
   .middle_box_content
     %div
-      %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by 
+      %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
       = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
       %strong.author= link_to_merge_request_author(@merge_request)
 
-      %cite.cgray and currently assigned to 
+      %cite.cgray and currently assigned to
       = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
       %strong.author= link_to_merge_request_assignee(@merge_request)
 
@@ -46,11 +46,11 @@
     .bottom_box_content
       - if @merge_request.merged?
         %span
-          Merged by #{@merge_request.merge_event.author_name} 
+          Merged by #{@merge_request.merge_event.author_name}
           %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
       - elsif @merge_request.closed_event
         %span
-          Closed by #{@merge_request.closed_event.author_name} 
+          Closed by #{@merge_request.closed_event.author_name}
           %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
 
 - unless can?(current_user, :accept_mr, @project)
@@ -61,37 +61,34 @@
 - if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
   .automerge_widget.can_be_merged{:style => "display:none"}
     .alert.alert-success
-      %span 
+      %span
         = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
          
         You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
-      
+
   .automerge_widget.cannot_be_merged{:style => "display:none"}
     .alert.alert-info
       %span
         = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
          
         %strong This request cant be merged with GitLab. You should do it manually
-  
+
   .automerge_widget.unchecked
     .alert-message
-      %strong 
+      %strong
         %i.icon-refresh
-        Checking for ability to automatically merge… 
-  
+        Checking for ability to automatically merge…
+
   .automerge_widget.already_cannot_be_merged{:style => "display:none"}
     .alert.alert-info
       %strong This merge request already can not be merged. Try to reload page.
 
-
-
-
 = render "merge_requests/commits"
 
 - unless @commits.empty?
   .nav.nav-tabs
     %li.active
-      = link_to "#notes", :class => "merge-notes-tab tab" do 
+      = link_to "#notes", :class => "merge-notes-tab tab" do
         Notes
     %li
       = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
@@ -120,11 +117,11 @@
 
 :javascript
   $(document).ready(function(){
-    $(".line_note_link, .line_note_reply_link").live("click", function(e) { 
+    $(".line_note_link, .line_note_reply_link").live("click", function(e) {
       var form = $(".per_line_form");
       $(this).parent().parent().after(form);
       form.find("#note_line_code").val($(this).attr("line_code"));
-      form.show();  
+      form.show();
       return false;
     });
   });