Download as
Browse Code »

Commit f1c534c68eecf68c72ce401e30c3d7d846052885

Authored by Dmitriy Zaporozhets
2 parents dfe9f367 fc49b201
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 11 changed files with 18 additions and 20 deletions   Show diff stats
app/views/admin/mailer/preview.html.haml
  Diff comments   View file @f1c534c
@@ -25,4 +25,4 @@ @@ -25,4 +25,4 @@
25 25
26 :javascript 26 :javascript
27 $(function() { 27 $(function() {
28 - $( "#accordion" ).accordion(); }); 28 + $("#accordion").accordion(); });
app/views/admin/projects/show.html.haml
  Diff comments   View file @f1c534c
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 %h3 36 %h3
37 Team 37 Team
38 %small 38 %small
39 - ( #{@admin_project.users_projects.count} ) 39 + (#{@admin_project.users_projects.count})
40 40
41 %hr 41 %hr
42 42
app/views/commits/compare.html.haml
  Diff comments   View file @f1c534c
@@ -36,12 +36,12 @@ @@ -36,12 +36,12 @@
36 $(function() { 36 $(function() {
37 var availableTags = #{@project.heads.map(&:name).to_json}; 37 var availableTags = #{@project.heads.map(&:name).to_json};
38 38
39 - $( "#from" ).autocomplete({ 39 + $("#from").autocomplete({
40 source: availableTags, 40 source: availableTags,
41 minLength: 1 41 minLength: 1
42 }); 42 });
43 43
44 - $( "#to" ).autocomplete({ 44 + $("#to").autocomplete({
45 source: availableTags, 45 source: availableTags,
46 minLength: 1 46 minLength: 1
47 }); 47 });
app/views/dashboard/index.html.haml
  Diff comments   View file @f1c534c
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %span.ico.projects 11 %span.ico.projects
12 = link_to "Projects" , "#projects", :id => "projects" 12 = link_to "Projects" , "#projects", :id => "projects"
13 %small 13 %small
14 - ( most recent ) 14 + (most recent)
15 15
16 %strong.right 16 %strong.right
17 = link_to projects_path do 17 = link_to projects_path do
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 %h3 55 %h3
56 = link_to "Merge Requests" , "#merge_requests", :id => "merge_requests" 56 = link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
57 57
58 - %small ( authored or assigned to you ) 58 + %small (authored or assigned to you)
59 %strong.right 59 %strong.right
60 = link_to dashboard_merge_requests_path do 60 = link_to dashboard_merge_requests_path do
61 Visit merge requests page → 61 Visit merge requests page →
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 %div.dashboard_category 67 %div.dashboard_category
68 %h3 68 %h3
69 = link_to "Issues" , "#issues", :id => "issues" 69 = link_to "Issues" , "#issues", :id => "issues"
70 - %small ( assigned to you ) 70 + %small (assigned to you)
71 %strong.right 71 %strong.right
72 = link_to dashboard_issues_path do 72 = link_to dashboard_issues_path do
73 Visit issues page → 73 Visit issues page →
app/views/dashboard/issues.html.haml
  Diff comments   View file @f1c534c
1 %h3 1 %h3
2 Issues 2 Issues
3 - %small ( assigned to you ) 3 + %small (assigned to you)
4 4
5 %br 5 %br
6 - if @issues.any? 6 - if @issues.any?
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @f1c534c
1 %h3 1 %h3
2 Merge Requests 2 Merge Requests
3 - %small ( authored or assigned to you ) 3 + %small (authored or assigned to you)
4 4
5 %br 5 %br
6 - if @merge_requests.any? 6 - if @merge_requests.any?
app/views/issues/create.js.haml
  Diff comments   View file @f1c534c
1 - if @issue.valid? 1 - if @issue.valid?
2 :plain 2 :plain
3 switchFromNewIssue(); 3 switchFromNewIssue();
4 - $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue} ))}"); 4 + $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue}))}");
5 $.ajax({type: "GET", url: location.href, dataType: "script"}); 5 $.ajax({type: "GET", url: location.href, dataType: "script"});
6 - else 6 - else
7 :plain 7 :plain
app/views/keys/create.js.haml
  Diff comments   View file @f1c534c
1 - if @key.valid? 1 - if @key.valid?
2 :plain 2 :plain
3 $("#new_key_dialog").dialog("close"); 3 $("#new_key_dialog").dialog("close");
4 - $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); 4 + $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key}))}");
5 $("#no_ssh_key_defined").hide(); 5 $("#no_ssh_key_defined").hide();
6 - else 6 - else
7 :plain 7 :plain
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @f1c534c
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 }); 29 });
30 30
31 $(document).keypress(function(e) { 31 $(document).keypress(function(e) {
32 - if( $(e.target).is(":input") ) return; 32 + if($(e.target).is(":input")) return;
33 switch(e.which) { 33 switch(e.which) {
34 case 115: focusSearch(); 34 case 115: focusSearch();
35 e.preventDefault(); 35 e.preventDefault();
app/views/refs/_tree_file.html.haml
  Diff comments   View file @f1c534c
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 .view_file 2 .view_file
3 .view_file_header 3 .view_file_header
4 .row 4 .row
5 - .span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png") 5 + .span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
6 .span2.mode_text= file.mode 6 .span2.mode_text= file.mode
7 .span7.file_name= name 7 .span7.file_name= name
8 .span4.right 8 .span4.right
9 - = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path] ), :class => "right", :target => "_blank"  
10 - = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref ), :class => "right", :style => "margin-right:10px;" 9 + = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
  10 + = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
11 - if file.text? 11 - if file.text?
12 .view_file_content 12 .view_file_content
13 - unless file.empty? 13 - unless file.empty?
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} 22 %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
23 - else 23 - else
24 %center 24 %center
25 - = link_to blob_project_ref_path(@project, @ref, :path => params[:path] ) do 25 + = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do
26 %div 26 %div
27 %br 27 %br
28 = image_tag "download.png", :width => 64 28 = image_tag "download.png", :width => 64
app/views/wikis/history.html.haml
  Diff comments   View file @f1c534c
@@ -11,9 +11,7 @@ @@ -11,9 +11,7 @@
11 %td= i + 1 11 %td= i + 1
12 %td 12 %td
13 = link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id) 13 = link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
14 - (  
15 - = time_ago_in_words(wiki_page.created_at)  
16 - ago  
17 - ) 14 + (#{time_ago_in_words(wiki_page.created_at)}
  15 + ago)
18 %td= wiki_page.user.name 16 %td= wiki_page.user.name
19 17