Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/views/admin/mailer/preview.html.haml

@@ -25,4 +25,4 @@
 
 :javascript
   $(function() {
-      $( "#accordion" ).accordion(); });
+      $("#accordion").accordion(); });

app/views/admin/projects/show.html.haml

@@ -36,7 +36,7 @@
   %h3
     Team
     %small
-      ( #{@admin_project.users_projects.count} )
+      (#{@admin_project.users_projects.count})
 
   %hr
 

app/views/commits/compare.html.haml

@@ -36,12 +36,12 @@
   $(function() {
     var availableTags = #{@project.heads.map(&:name).to_json};
 
-    $( "#from" ).autocomplete({
+    $("#from").autocomplete({
       source: availableTags,
       minLength: 1
     });
 
-    $( "#to" ).autocomplete({
+    $("#to").autocomplete({
       source: availableTags,
       minLength: 1
     });

app/views/dashboard/index.html.haml

@@ -11,7 +11,7 @@
     %span.ico.projects
     = link_to "Projects" , "#projects", :id => "projects"
     %small
-      ( most recent )
+      (most recent)
 
   %strong.right
     = link_to projects_path do 
@@ -55,7 +55,7 @@
     %h3
       = link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
       
-      %small ( authored or assigned to you )
+      %small (authored or assigned to you)
     %strong.right
       = link_to dashboard_merge_requests_path do 
         Visit merge requests page → 
@@ -67,7 +67,7 @@
   %div.dashboard_category
     %h3
       = link_to "Issues" , "#issues", :id => "issues"
-      %small ( assigned to you )
+      %small (assigned to you)
     %strong.right
       = link_to dashboard_issues_path do 
         Visit issues page → 

app/views/dashboard/issues.html.haml

@@ -1,6 +1,6 @@
 %h3
   Issues
-  %small ( assigned to you )
+  %small (assigned to you)
 
 %br
 - if @issues.any?

app/views/dashboard/merge_requests.html.haml

@@ -1,6 +1,6 @@
 %h3
   Merge Requests
-  %small ( authored or assigned to you )
+  %small (authored or assigned to you)
 
 %br
 - if @merge_requests.any?

app/views/issues/create.js.haml

@@ -1,7 +1,7 @@
 - if @issue.valid?
   :plain
     switchFromNewIssue();
-    $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue} ))}");
+    $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue}))}");
     $.ajax({type: "GET", url: location.href, dataType: "script"});
 - else
   :plain

app/views/keys/create.js.haml

@@ -1,7 +1,7 @@
 - if @key.valid?
   :plain
     $("#new_key_dialog").dialog("close");
-    $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
+    $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key}))}");
     $("#no_ssh_key_defined").hide();
 - else
   :plain

app/views/layouts/_head_panel.html.haml

@@ -29,7 +29,7 @@
     });
 
     $(document).keypress(function(e) {
-      if( $(e.target).is(":input") ) return;
+      if($(e.target).is(":input")) return;
         switch(e.which)  {
         case 115:  focusSearch();
         e.preventDefault();

app/views/refs/_tree_file.html.haml

@@ -2,12 +2,12 @@
 .view_file
   .view_file_header
     .row
-      .span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png")
+      .span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
       .span2.mode_text= file.mode
       .span7.file_name= name
       .span4.right
-        = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path] ), :class => "right", :target => "_blank"
+        = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
-        = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref ), :class => "right", :style => "margin-right:10px;"
+        = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
   - if file.text?
     .view_file_content
       - unless file.empty?
@@ -22,7 +22,7 @@
       %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
   - else
     %center
-      = link_to blob_project_ref_path(@project, @ref, :path => params[:path] ) do 
+      = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do 
         %div
           %br
           = image_tag "download.png", :width => 64

app/views/wikis/history.html.haml

@@ -11,9 +11,7 @@
         %td= i + 1
         %td
           = link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
-          (
+          (#{time_ago_in_words(wiki_page.created_at)}
-          = time_ago_in_words(wiki_page.created_at)
+          ago)
-          ago
-          )
         %td= wiki_page.user.name