Download as
Browse Code »

Commit 3bd06d55e0c7e0accf9efd2e0d67cf1ae76f7b0d

Authored by Andrey Vakarev
1 parent 7e0726b1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove trailing whitespaces and trailing lines

Showing 80 changed files with 261 additions and 296 deletions   Show diff stats
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -4,7 +4,7 @@
4 4 %h5
5 5 Resque Workers
6 6 .data.padded
7   - = link_to "/info/resque" do
  7 + = link_to "/info/resque" do
8 8 %h1{:class => @workers.present? ? "cgreen" : "cred"}
9 9 = @workers.count
10 10 %hr
... ... @@ -16,7 +16,7 @@
16 16 .ui-box
17 17 %h5 Projects
18 18 .data.padded
19   - = link_to admin_projects_path do
  19 + = link_to admin_projects_path do
20 20 %h1= Project.count
21 21 %hr
22 22 = link_to 'New Project', new_admin_project_path, :class => "btn small"
... ... @@ -24,7 +24,7 @@
24 24 .ui-box
25 25 %h5 Users
26 26 .data.padded
27   - = link_to admin_users_path do
  27 + = link_to admin_users_path do
28 28 %h1= User.count
29 29 %hr
30 30 = link_to 'New User', new_admin_user_path, :class => "btn small"
... ...
app/views/admin/projects/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -9,14 +9,14 @@
9 9 = f.label :name
10 10 .input= f.text_field :name
11 11 .clearfix
12   - = f.label :path do
  12 + = f.label :path do
13 13 Path
14 14 .input
15 15 .input-prepend
16 16 %span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:"
17 17 = f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
18 18 .clearfix
19   - = f.label :code do
  19 + = f.label :code do
20 20 Code
21 21 .input
22 22 .input-prepend
... ... @@ -28,7 +28,7 @@
28 28 = f.label :owner_id
29 29 .input= f.select :owner_id, User.all.map { |user| [user.name, user.id] }
30 30  
31   - - if @admin_project.repo_exists?
  31 + - if @admin_project.repo_exists?
32 32 .clearfix
33 33 = f.label :default_branch, "Default Branch"
34 34 .input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;")
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @3bd06d5
1   -%h3
  1 +%h3
2 2 Projects
3 3 = link_to 'New Project', new_admin_project_path, :class => "btn small right"
4 4 %br
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -9,7 +9,7 @@
9 9 %b
10 10 Name:
11 11 %td
12   - = @admin_project.name
  12 + = @admin_project.name
13 13 %tr
14 14 %td
15 15 %b
... ... @@ -59,7 +59,7 @@
59 59 %br
60 60 %h3 Add new team member
61 61 %br
62   -= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
  62 += form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
63 63 %table.zebra-striped.table-bordered
64 64 %thead
65 65 %tr
... ... @@ -73,11 +73,11 @@
73 73 %tr
74 74 %td= submit_tag 'Add', :class => "btn primary"
75 75 %td
76   - Read more about project permissions
  76 + Read more about project permissions
77 77 %strong= link_to "here", help_permissions_path, :class => "vlink"
78 78  
79   -:css
80   - form select {
  79 +:css
  80 + form select {
81 81 width:150px;
82 82 }
83 83  
... ... @@ -85,9 +85,7 @@
85 85 width:300px;
86 86 }
87 87  
88   -
89   -:javascript
  88 +:javascript
90 89 $('select#user_ids').chosen();
91 90 $('select#repo_access').chosen();
92 91 $('select#project_access').chosen();
93   -
... ...
app/views/admin/team_members/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -16,7 +16,7 @@
16 16 = link_to 'Cancel', :back, :class => "btn"
17 17  
18 18 :css
19   - form select {
  19 + form select {
20 20 width:300px;
21 21 }
22 22  
... ... @@ -25,4 +25,3 @@
25 25 $('select#team_member_project_id').chosen();
26 26 $('select#team_member_repo_access').chosen();
27 27 $('select#team_member_project_access').chosen();
28   -
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @3bd06d5
1   -%h3
  1 +%h3
2 2 Users
3 3 = link_to 'New User', new_admin_user_path, :class => "btn small right"
4 4 %br
5 5  
6 6 %ul.nav.nav-pills
7 7 %li{:class => "#{'active' unless params[:filter]}"}
8   - = link_to "Active", admin_users_path
  8 + = link_to "Active", admin_users_path
9 9 %li{:class => "#{'active' if params[:filter] == "admins"}"}
10 10 = link_to admin_users_path(:filter => "admins") do
11 11 Admins
... ... @@ -34,9 +34,9 @@
34 34 %td= user.users_projects.count
35 35 %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}", :class => "btn small"
36 36 %td
37   - - if user.blocked
  37 + - if user.blocked
38 38 = link_to 'Unblock', unblock_admin_user_path(user), :method => :put, :class => "btn small success"
39   - - else
  39 + - else
40 40 = link_to 'Block', block_admin_user_path(user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger"
41 41 %td= link_to 'Destroy', [:admin, user], :confirm => 'USER WILL BE REMOVED! Are you sure?', :method => :delete, :class => "btn small danger"
42 42  
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -53,11 +53,10 @@
53 53 %td
54 54 = @admin_user.twitter
55 55  
56   -
57 56 %br
58 57 %h3 Add User to Projects
59 58 %br
60   -= form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do
  59 += form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do
61 60 %table.table-bordered
62 61 %thead
63 62 %tr
... ... @@ -71,7 +70,7 @@
71 70 %tr
72 71 %td= submit_tag 'Add', :class => "btn primary"
73 72 %td
74   - Read more about project permissions
  73 + Read more about project permissions
75 74 %strong= link_to "here", help_permissions_path, :class => "vlink"
76 75 %br
77 76  
... ... @@ -95,8 +94,8 @@
95 94 %td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small"
96 95 %td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger"
97 96  
98   -:css
99   - form select {
  97 +:css
  98 + form select {
100 99 width:150px;
101 100 }
102 101  
... ... @@ -104,9 +103,7 @@
104 103 width:300px;
105 104 }
106 105  
107   -
108   -:javascript
  106 +:javascript
109 107 $('select#project_ids').chosen();
110 108 $('select#repo_access').chosen();
111 109 $('select#project_access').chosen();
112   -
... ...
app/views/commits/_diffs.html.haml
  Diff comments   View file @3bd06d5
1 1 - if @suppress_diff
2 2 .alert-message.block-message
3   - %p
4   - %strong Warning! Large commit with more then 200 files changed.
  3 + %p
  4 + %strong Warning! Large commit with more then 200 files changed.
5 5 %p To prevent performance issue we rejected diff information.
6   - %p
7   - But if you still want to see diff
8   - = link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark"
9   -
  6 + %p
  7 + But if you still want to see diff
  8 + = link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark"
10 9  
11 10 %p.cgray
12 11 Showing #{pluralize(diffs.count, "changed file")}
13 12 .file_stats
14 13 = render "commits/diff_head", :diffs => diffs
15 14  
16   -
17 15 - unless @suppress_diff
18 16 - diffs.each_with_index do |diff, i|
19 17 - next if diff.diff.empty?
... ... @@ -39,4 +37,3 @@
39 37 - else
40 38 %p
41 39 %center No preview for this file type
42   -
... ...
app/views/commits/_head.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -5,18 +5,18 @@
5 5 = hidden_field_tag :destination, "commits"
6 6  
7 7 %li{:class => "#{'active' if current_page?(project_commits_path(@project)) }"}
8   - = link_to project_commits_path(@project) do
  8 + = link_to project_commits_path(@project) do
9 9 Commits
10 10 %li{:class => "#{'active' if current_page?(compare_project_commits_path(@project)) }"}
11   - = link_to compare_project_commits_path(@project) do
  11 + = link_to compare_project_commits_path(@project) do
12 12 Compare
13 13 %li{:class => "#{branches_tab_class}"}
14   - = link_to project_repository_path(@project) do
  14 + = link_to project_repository_path(@project) do
15 15 Branches
16 16 %span.number= @project.repo.branch_count
17 17  
18 18 %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
19   - = link_to tags_project_repository_path(@project) do
  19 + = link_to tags_project_repository_path(@project) do
20 20 Tags
21 21 %span.number= @project.repo.tag_count
22 22  
... ... @@ -24,10 +24,9 @@
24 24 - if current_page?(project_commits_path(@project)) && current_user.private_token
25 25 %li.right
26 26 %span.rss-icon
27   - = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do
  27 + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do
28 28 = image_tag "rss_ui.png", :title => "feed"
29 29  
30   -
31 30 :javascript
32 31 $(function(){
33 32 $('.project-refs-select').chosen();
... ...
app/views/commits/_text_file.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -9,14 +9,14 @@
9 9 %td.old_line= "..."
10 10 %td.new_line= "..."
11 11 %td.line_content.matched= line
12   - - else
  12 + - else
13 13 %td.old_line
14 14 = link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code
15 15 - if @comments_allowed
16   - = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line"
  16 + = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line"
17 17 %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code
18 18 %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
19   -
  19 +
20 20 - if @comments_allowed
21 21 - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
22 22 - unless comments.empty?
... ...
app/views/commits/compare.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "head"
2 2  
3   -%h3
  3 +%h3
4 4 Compare View
5 5 %hr
6 6  
7 7 %div
8   - %p
9   - Fill input field with commit id like
  8 + %p
  9 + Fill input field with commit id like
10 10 %code '4eedf23'
11   - or branch/tag name like
12   - %code master
  11 + or branch/tag name like
  12 + %code master
13 13 & press compare button for commits list, code diff.
14 14  
15 15 %br
16 16  
17   - = form_tag compare_project_commits_path(@project), :method => :get do
  17 + = form_tag compare_project_commits_path(@project), :method => :get do
18 18 .clearfix
19 19 = text_field_tag :from, params[:from], :placeholder => "master", :class => "xlarge"
20 20 = "..."
... ... @@ -31,7 +31,6 @@
31 31 %h4 Diff
32 32 = render "commits/diffs", :diffs => @diffs
33 33  
34   -
35 34 :javascript
36 35 $(function() {
37 36 var availableTags = #{@project.heads.map(&:name).to_json};
... ...
app/views/commits/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -6,7 +6,7 @@
6 6 %span.arrow
7 7 = link_to project_commits_path(@project) do
8 8 = @project.name
9   - %span.divider
  9 + %span.divider
10 10 \/
11 11 %li
12 12 %a{:href => "#"}= params[:path].split("/").join(" / ")
... ...
app/views/commits/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -38,11 +38,11 @@
38 38  
39 39 :javascript
40 40 $(document).ready(function(){
41   - $(".line_note_link, .line_note_reply_link").live("click", function(e) {
  41 + $(".line_note_link, .line_note_reply_link").live("click", function(e) {
42 42 var form = $(".per_line_form");
43 43 $(this).parent().parent().after(form);
44 44 form.find("#note_line_code").val($(this).attr("line_code"));
45   - form.show();
  45 + form.show();
46 46 return false;
47 47 });
48 48 });
... ...
app/views/deploy_keys/index.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "repositories/head"
2 2 - if can? current_user, :admin_project, @project
3 3 .alert-message.block-message
4   - Deploy keys allow read-only access to repository.
5   - = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
6   - Add Deploy Key
  4 + Deploy keys allow read-only access to repository.
  5 + = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
  6 + Add Deploy Key
7 7  
8 8 - if @keys.any?
9 9 %table
... ...
app/views/errors/encoding.html.haml
  Diff comments   View file @3bd06d5
1 1 .alert-message.block-message.error
2 2 %h3 Encoding Error
3 3 %hr
4   - %p
  4 + %p
5 5 Page cant be loaded cause of encoding error
6 6  
... ...
app/views/errors/git_not_found.html.haml
  Diff comments   View file @3bd06d5
1 1 .alert-message.block-message.error
2 2 %h3 Git Resource Not found
3 3 %hr
4   - %p
5   - Application cant get access to some
  4 + %p
  5 + Application cant get access to some
6 6 %span.label branch
7   - or
  7 + or
8 8 %span.label commit
9 9 in your repository. Maybe it was moved
... ...
app/views/events/_event.html.haml
  Diff comments   View file @3bd06d5
1 1 - if event.allowed?
2 2 .event_feed
3   - - if event.issue?
  3 + - if event.issue?
4 4 = render "events/event_issue", :event => event
5   - - elsif event.merge_request?
  5 + - elsif event.merge_request?
6 6 = render "events/event_merge_request", :event => event
7 7 - elsif event.push?
8 8 = render "events/event_push", :event => event
... ...
app/views/events/_event_issue.html.haml
  Diff comments   View file @3bd06d5
1 1 = image_tag gravatar_icon(event.author_email), :class => "avatar"
2   -%strong #{event.author_name}
  2 +%strong #{event.author_name}
3 3 %span.event_label= event.action_name
4   - issue
  4 + issue
5 5 = link_to project_issue_path(event.project, event.issue) do
6 6 %strong= truncate event.issue_title
7   -at
  7 +at
8 8 %strong= link_to event.project.name, event.project
9 9 %span.cgray
10 10 = time_ago_in_words(event.created_at)
... ...
app/views/events/_event_merge_request.html.haml
  Diff comments   View file @3bd06d5
1 1 - if event.action_name == "merged"
2 2 .event_icon= image_tag "event_mr_merged.png"
3 3 = image_tag gravatar_icon(event.author_email), :class => "avatar"
4   -%strong #{event.author_name}
  4 +%strong #{event.author_name}
5 5 %span.event_label= event.action_name
6   - merge request
  6 + merge request
7 7 = link_to project_merge_request_path(event.project, event.merge_request) do
8 8 %strong= truncate event.merge_request_title
9   -at
  9 +at
10 10 %strong= link_to event.project.name, event.project
11 11 %span.cgray
12 12 = time_ago_in_words(event.created_at)
... ...
app/views/events/_event_push.html.haml
  Diff comments   View file @3bd06d5
1 1 %div
2 2 .event_icon= image_tag "event_push.png"
3 3 = image_tag gravatar_icon(event.author_email), :class => "avatar"
4   - %strong #{event.author_name}
  4 + %strong #{event.author_name}
5 5 %span.event_label= event.push_action_name
6 6 = event.ref_type
7 7 = link_to project_commits_path(event.project, :ref => event.ref_name) do
8 8 %strong= event.ref_name
9   - at
  9 + at
10 10 %strong= link_to event.project.name, event.project
11 11 %span.cgray
12 12 = time_ago_in_words(event.created_at)
... ... @@ -14,9 +14,9 @@
14 14  
15 15 - if event.push_with_commits?
16 16 - if event.commits_count > 1
17   - = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do
  17 + = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do
18 18 %strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
19   - - project = event.project
  19 + - project = event.project
20 20 %ul.unstyled.event_commits
21 21 - if event.commits_count > 3
22 22 - event.commits[0...2].each do |commit|
... ... @@ -24,7 +24,6 @@
24 24 %li
25 25 %br
26 26 \... and #{event.commits_count - 2} more commits
27   - - else
  27 + - else
28 28 - event.commits.each do |commit|
29 29 = render "events/commit", :commit => commit, :project => project
30   -
... ...
app/views/help/index.html.haml
  Diff comments   View file @3bd06d5
1   -%h3.cgray
  1 +%h3.cgray
2 2 GITLAB
3 3 %span.right v2.5
4 4 %hr
5 5 %h4 Self Hosted Git Management
6   -%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
  6 +%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
7 7  
8 8 %hr
9 9  
... ...
app/views/help/web_hooks.html.haml
  Diff comments   View file @3bd06d5
1 1 %h3 Web hooks
2 2 %br
3 3  
4   -%p Application will send POST request with some data like example below:
  4 +%p Application will send POST request with some data like example below:
5 5 %h5 Hooks request example:
6 6 .borders= render "hooks/data_ex"
7 7  
... ...
app/views/help/workflow.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -6,33 +6,33 @@
6 6 %li
7 7 %p Clone project
8 8 .bash
9   - %pre
  9 + %pre
10 10 git clone git@example.com:project-name.git
11 11  
12 12 %li
13 13 %p Create branch with your feature
14 14 .bash
15   - %pre
  15 + %pre
16 16 git checkout -b $feature_name
17 17  
18 18 %li
19 19 %p Write code. Commit changes
20 20 .bash
21   - %pre
  21 + %pre
22 22 git commit -am "My feature is ready"
23 23  
24 24 %li
25 25 %p Push your branch to gitlabhq
26 26 .bash
27   - %pre
  27 + %pre
28 28 git push origin $feature_name
29 29  
30   - %li
  30 + %li
31 31 %p Review your code on Commits page
32 32  
33   - %li
  33 + %li
34 34 %p Create a merge request
35 35  
36   - %li
  36 + %li
37 37 %p Your team lead will review code & merge it to main branch
38 38  
... ...
app/views/hooks/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -5,7 +5,7 @@
5 5 %span
6 6 Post receive hooks for binding events when someone push to repository.
7 7 %br
8   - Read more about web hooks
  8 + Read more about web hooks
9 9 %strong #{link_to "here", help_web_hooks_path, :class => "vlink"}
10 10  
11 11 = form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do |f|
... ... @@ -30,7 +30,7 @@
30 30 %tr
31 31 %th URL
32 32 %th Method
33   - %th
  33 + %th
34 34 - @hooks.each do |hook|
35 35 %tr
36 36 %td
... ... @@ -40,4 +40,3 @@
40 40 %td POST
41 41 %td
42 42 = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
43   -
... ...
app/views/issues/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -24,7 +24,7 @@
24 24 .clearfix
25 25 = f.label :critical, "Critical"
26 26 .input= f.check_box :critical
27   -
  27 +
28 28 - unless @issue.new_record?
29 29 .clearfix
30 30 = f.label :closed
... ... @@ -35,8 +35,6 @@
35 35 = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
36 36 %p.hint Markdown is enabled.
37 37  
38   -
39   -
40 38 .actions
41 39 - if @issue.new_record?
42 40 = f.submit 'Submit new issue', :class => "primary btn"
... ... @@ -44,9 +42,9 @@
44 42 = f.submit 'Save changes', :class => "primary btn"
45 43  
46 44 - if request.xhr?
47   - = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
48   - - else
  45 + = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
  46 + - else
49 47 - if @issue.new_record?
50 48 = link_to "Cancel", project_issues_path(@project), :class => "btn"
51   - - else
  49 + - else
52 50 = link_to "Cancel", project_issue_path(@project, @issue), :class => "btn"
... ...
app/views/issues/_head.html.haml
  Diff comments   View file @3bd06d5
1 1 %ul.nav.nav-tabs
2 2 %li{:class => "#{'active' if current_page?(project_issues_path(@project))}"}
3   - = link_to project_issues_path(@project), :class => "tab" do
4   - Browse Issues
  3 + = link_to project_issues_path(@project), :class => "tab" do
  4 + Browse Issues
5 5 %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"}
6   - = link_to project_milestones_path(@project), :class => "tab" do
7   - Milestones
  6 + = link_to project_milestones_path(@project), :class => "tab" do
  7 + Milestones
8 8 %li.right
9 9 %span.rss-icon
10   - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
  10 + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
11 11 = image_tag "rss_ui.png", :title => "feed"
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -7,7 +7,7 @@
7 7 = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small padded", :remote => true
8 8 - else
9 9 = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small padded", :remote => true
10   - = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do
  10 + = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do
11 11 %i.icon-edit
12 12 Edit
13 13  
... ... @@ -22,11 +22,5 @@
22 22 - if issue.upvotes > 0
23 23 %span.label.success= "+#{issue.upvotes}"
24 24  
25   -
26   -
27 25 = link_to project_issue_path(issue.project, issue) do
28 26 %p.row_title= truncate(issue.title, :length => 100)
29   -
30   -
31   -
32   -
... ...
app/views/issues/edit.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "form"
2 2  
3   -:javascript
4   - $(function(){
  3 +:javascript
  4 + $(function(){
5 5 $('select#issue_assignee_id').chosen();
6 6 $('select#issue_milestone_id').chosen();
7 7 });
... ...
app/views/issues/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -6,7 +6,7 @@
6 6 .right
7 7 .span5
8 8 - if can? current_user, :write_issue, @project
9   - = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
  9 + = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
10 10 New Issue
11 11 = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do
12 12 = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
... ... @@ -20,16 +20,16 @@
20 20 .span6
21 21 %ul.nav.nav-pills.left
22 22 %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
23   - = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
  23 + = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
24 24 Open
25 25 %li{:class => ("active" if params[:f] == "2")}
26   - = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
  26 + = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
27 27 Closed
28 28 %li{:class => ("active" if params[:f] == "3")}
29   - = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
  29 + = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
30 30 To Me
31 31 %li{:class => ("active" if params[:f] == "1")}
32   - = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
  32 + = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
33 33 All
34 34  
35 35 .span4.right
... ...
app/views/issues/new.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "form"
2 2  
3   -:javascript
4   - $(function(){
  3 +:javascript
  4 + $(function(){
5 5 $('select#issue_assignee_id').chosen();
6 6 $('select#issue_milestone_id').chosen();
7 7 });
... ...
app/views/issues/show.html.haml
  Diff comments   View file @3bd06d5
1 1 %h3
2 2 Issue ##{@issue.id}
3 3 %small
4   - created at
  4 + created at
5 5 = @issue.created_at.stamp("Aug 21, 2011")
6 6  
7 7 %span.right
... ... @@ -11,7 +11,7 @@
11 11 - else
12 12 = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue"
13 13 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
14   - = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
  14 + = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
15 15 %i.icon-edit
16 16 Edit
17 17  
... ... @@ -20,7 +20,7 @@
20 20 .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
21 21  
22 22 .back_link
23   - = link_to project_issues_path(@project) do
  23 + = link_to project_issues_path(@project) do
24 24 ← To issues list
25 25  
26 26 .main_box
... ... @@ -28,7 +28,7 @@
28 28 %h4
29 29 - if @issue.closed
30 30 .alert-message.error.status_info Closed
31   - - else
  31 + - else
32 32 .alert-message.success.status_info Open
33 33 = @issue.title
34 34  
... ... @@ -37,17 +37,17 @@
37 37 = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
38 38 %strong.author= link_to_issue_author(@issue)
39 39  
40   - %cite.cgray and currently assigned to
  40 + %cite.cgray and currently assigned to
41 41 = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
42 42 %strong.author= link_to_issue_assignee(@issue)
43 43  
44   - - if @issue.milestone
  44 + - if @issue.milestone
45 45 - milestone = @issue.milestone
46   - %cite.cgray and attached to milestone
  46 + %cite.cgray and attached to milestone
47 47 = link_to project_milestone_path(milestone.project, milestone) do
48 48 %strong
49 49 = truncate(milestone.title, :length => 20)
50   -
  50 +
51 51 - if @issue.description.present?
52 52 .bottom_box_content
53 53 = preserve do
... ...
app/views/keys/index.html.haml
  Diff comments   View file @3bd06d5
1   -%h3
  1 +%h3
2 2 SSH Keys
3 3 = link_to "Add new", new_key_path, :class => "btn small right"
4   -
  4 +
5 5 %br
6 6  
7 7 %table#keys-table.admin-table
... ...
app/views/keys/show.html.haml
  Diff comments   View file @3bd06d5
1 1 %h3
2   - Public key:
  2 + Public key:
3 3 = @key.title
4 4 %small
5   - created at
  5 + created at
6 6 = @key.created_at.stamp("Aug 21, 2011")
7 7 .back_link
8   - = link_to keys_path do
  8 + = link_to keys_path do
9 9 ← To keys list
10 10 %hr
11 11  
12 12 %pre= @key.key
13 13 .actions
14 14 = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key"
15   -
16   -
... ...
app/views/layouts/_app_menu.html.haml
  Diff comments   View file @3bd06d5
1 1 %nav.main_menu
2 2 = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
3   - = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
  3 + = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
4 4 Issues
5 5 %span.count= current_user.assigned_issues.opened.count
6 6 = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
7 7 Requests
8 8 %span.count= current_user.cared_merge_requests.count
9   - = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
  9 + = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
10 10 Search
11 11 = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
... ...
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -3,8 +3,8 @@
3 3 .container
4 4 .top_panel_content
5 5 %div.app_logo
6   - = link_to root_path, :class => "home", :title => "Home" do
7   - %h1
  6 + = link_to root_path, :class => "home", :title => "Home" do
  7 + %h1
8 8 GITLAB
9 9 %span.separator
10 10 %h1.project_name= title
... ... @@ -13,11 +13,11 @@
13 13 = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
14 14 .fbtn
15 15 - if current_user.is_admin?
16   - = link_to admin_root_path, :class => "btn small", :title => "Admin area" do
  16 + = link_to admin_root_path, :class => "btn small", :title => "Admin area" do
17 17 %i.icon-cog
18 18 Admin
19 19 - if current_user.can_create_project?
20   - = link_to new_project_path, :class => "btn small", :title => "Create New Project" do
  20 + = link_to new_project_path, :class => "btn small", :title => "Create New Project" do
21 21 %i.icon-plus
22 22 Project
23 23 .account-box
... ... @@ -43,4 +43,3 @@
43 43 }
44 44 });
45 45 });
46   -
... ...
app/views/layouts/_project_menu.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -2,14 +2,14 @@
2 2 = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
3 3 - if @project.repo_exists?
4 4 - if can? current_user, :download_code, @project
5   - = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
  5 + = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
6 6 Files
7 7 = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
8 8  
9 9 = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
10 10 - if @project.issues_enabled
11 11 = link_to project_issues_filter_path(@project), :class => issues_tab? ? "current" : nil do
12   - Issues
  12 + Issues
13 13 %span.count= @project.issues.opened.count
14 14 - if @project.merge_requests_enabled
15 15 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
... ... @@ -19,7 +19,7 @@
19 19 - if @project.wall_enabled
20 20 = link_to wall_project_path(@project), :class => wall_tab? ? "current" : nil do
21 21 Wall
22   -
  22 +
23 23 - if @project.wiki_enabled
24 24 = link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do
25 25 Wiki
... ...
app/views/merge_requests/_commits.html.haml
  Diff comments   View file @3bd06d5
1   -- unless @commits.empty?
  1 +- unless @commits.empty?
2 2 .ui-box
3 3 %h5 Commits (#{@commits.count})
4 4 .merge-request-commits
5 5 - if @commits.count > 8
6 6 %ul.first_mr_commits.unstyled
7   - - @commits.first(8).each do |commit|
  7 + - @commits.first(8).each do |commit|
8 8 = render "commits/commit", :commit => commit
9   - %li.bottom
  9 + %li.bottom
10 10 8 of #{@commits.count} commits displayed.
11   - %strong
  11 + %strong
12 12 = link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
13 13 %ul.all_mr_commits.hide.unstyled
14   - - @commits.each do |commit|
  14 + - @commits.each do |commit|
15 15 = render "commits/commit", :commit => commit
16 16  
17   - - else
  17 + - else
18 18 %ul.unstyled
19   - - @commits.each do |commit|
  19 + - @commits.each do |commit|
20 20 = render "commits/commit", :commit => commit
21 21  
22   -- else
  22 +- else
23 23 %h5
24   - Nothing to merge from
25   - %span.label #{@merge_request.source_branch}
26   - to
  24 + Nothing to merge from
  25 + %span.label #{@merge_request.source_branch}
  26 + to
27 27 %span.label #{@merge_request.target_branch}
28 28 %br
... ...
app/views/merge_requests/_diffs.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "commits/diffs", :diffs => @diffs
2   -- if @diffs.empty?
  2 +- if @diffs.empty?
3 3 %p.cgray Nothing to merge
... ...
app/views/merge_requests/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -25,10 +25,10 @@
25 25 .form-actions
26 26 = f.submit 'Save', :class => "btn-primary btn"
27 27 - if @merge_request.new_record?
28   - = link_to project_merge_requests_path(@project), :class => "btn" do
  28 + = link_to project_merge_requests_path(@project), :class => "btn" do
29 29 Cancel
30   - - else
31   - = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
  30 + - else
  31 + = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
32 32 Cancel
33 33  
34 34  
... ... @@ -41,11 +41,11 @@
41 41  
42 42  
43 43  
44   - $("#merge_request_source_branch").live("change", function() {
  44 + $("#merge_request_source_branch").live("change", function() {
45 45 $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
46 46 });
47 47  
48   - $("#merge_request_target_branch").live("change", function() {
  48 + $("#merge_request_target_branch").live("change", function() {
49 49 $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
50 50 });
51 51 });
... ...
app/views/merge_requests/_head.html.haml
  Diff comments   View file @3bd06d5
1 1 .top-tabs
2   - = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
3   - %span
4   - Merge Requests
  2 + = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
  3 + %span
  4 + Merge Requests
5 5  
... ...
app/views/merge_requests/index.html.haml
  Diff comments   View file @3bd06d5
1 1 %h3
2 2 Merge Requests
3 3 - if can? current_user, :write_issue, @project
4   - = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
  4 + = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
5 5 New Merge Request
6 6  
7 7 %br
... ... @@ -10,16 +10,16 @@
10 10 .title
11 11 %ul.nav.nav-pills
12 12 %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
13   - = link_to project_merge_requests_path(@project, :f => 0) do
  13 + = link_to project_merge_requests_path(@project, :f => 0) do
14 14 Open
15 15 %li{:class => ("active" if params[:f] == "2")}
16   - = link_to project_merge_requests_path(@project, :f => 2) do
  16 + = link_to project_merge_requests_path(@project, :f => 2) do
17 17 Closed
18 18 %li{:class => ("active" if params[:f] == "3")}
19   - = link_to project_merge_requests_path(@project, :f => 3) do
  19 + = link_to project_merge_requests_path(@project, :f => 3) do
20 20 To Me
21 21 %li{:class => ("active" if params[:f] == "1")}
22   - = link_to project_merge_requests_path(@project, :f => 1) do
  22 + = link_to project_merge_requests_path(@project, :f => 1) do
23 23 All
24 24  
25 25 %ul.unstyled
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -9,7 +9,7 @@
9 9 - if can?(current_user, :modify_merge_request, @merge_request)
10 10 - if @merge_request.open?
11 11 = 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"
12   - = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
  12 + = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
13 13 %i.icon-edit
14 14 Edit
15 15  
... ... @@ -19,7 +19,7 @@
19 19  
20 20 = render "merge_requests/how_to_merge"
21 21 .back_link
22   - = link_to project_merge_requests_path(@project) do
  22 + = link_to project_merge_requests_path(@project) do
23 23 ← To merge requests
24 24  
25 25 .main_box
... ... @@ -27,17 +27,17 @@
27 27 %h4
28 28 - if @merge_request.closed
29 29 .alert-message.error.status_info Closed
30   - - else
  30 + - else
31 31 .alert-message.success.status_info Open
32 32 = @merge_request.title
33 33  
34 34 .middle_box_content
35 35 %div
36   - %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
  36 + %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
37 37 = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
38 38 %strong.author= link_to_merge_request_author(@merge_request)
39 39  
40   - %cite.cgray and currently assigned to
  40 + %cite.cgray and currently assigned to
41 41 = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
42 42 %strong.author= link_to_merge_request_assignee(@merge_request)
43 43  
... ... @@ -46,11 +46,11 @@
46 46 .bottom_box_content
47 47 - if @merge_request.merged?
48 48 %span
49   - Merged by #{@merge_request.merge_event.author_name}
  49 + Merged by #{@merge_request.merge_event.author_name}
50 50 %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
51 51 - elsif @merge_request.closed_event
52 52 %span
53   - Closed by #{@merge_request.closed_event.author_name}
  53 + Closed by #{@merge_request.closed_event.author_name}
54 54 %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
55 55  
56 56 - unless can?(current_user, :accept_mr, @project)
... ... @@ -61,37 +61,34 @@
61 61 - if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
62 62 .automerge_widget.can_be_merged{:style => "display:none"}
63 63 .alert.alert-success
64   - %span
  64 + %span
65 65 = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
66 66  
67 67 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
68   -
  68 +
69 69 .automerge_widget.cannot_be_merged{:style => "display:none"}
70 70 .alert.alert-info
71 71 %span
72 72 = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
73 73  
74 74 %strong This request cant be merged with GitLab. You should do it manually
75   -
  75 +
76 76 .automerge_widget.unchecked
77 77 .alert-message
78   - %strong
  78 + %strong
79 79 %i.icon-refresh
80   - Checking for ability to automatically merge…
81   -
  80 + Checking for ability to automatically merge…
  81 +
82 82 .automerge_widget.already_cannot_be_merged{:style => "display:none"}
83 83 .alert.alert-info
84 84 %strong This merge request already can not be merged. Try to reload page.
85 85  
86   -
87   -
88   -
89 86 = render "merge_requests/commits"
90 87  
91 88 - unless @commits.empty?
92 89 .nav.nav-tabs
93 90 %li.active
94   - = link_to "#notes", :class => "merge-notes-tab tab" do
  91 + = link_to "#notes", :class => "merge-notes-tab tab" do
95 92 Notes
96 93 %li
97 94 = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
... ... @@ -120,11 +117,11 @@
120 117  
121 118 :javascript
122 119 $(document).ready(function(){
123   - $(".line_note_link, .line_note_reply_link").live("click", function(e) {
  120 + $(".line_note_link, .line_note_reply_link").live("click", function(e) {
124 121 var form = $(".per_line_form");
125 122 $(this).parent().parent().after(form);
126 123 form.find("#note_line_code").val($(this).attr("line_code"));
127   - form.show();
  124 + form.show();
128 125 return false;
129 126 });
130 127 });
... ...
app/views/milestones/_form.html.haml
  Diff comments   View file @3bd06d5
1 1 %h3= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
2 2 .back_link
3   - = link_to project_milestones_path(@project) do
  3 + = link_to project_milestones_path(@project) do
4 4 ← To milestones
5 5  
6 6 %hr
... ... @@ -30,7 +30,6 @@
30 30 .controls
31 31 .datepicker
32 32  
33   -
34 33 .form-actions
35 34 - if @milestone.new_record?
36 35 = f.submit 'Create milestone', :class => "primary btn"
... ... @@ -38,11 +37,11 @@
38 37 = f.submit 'Save changes', :class => "primary btn"
39 38  
40 39 - if request.xhr?
41   - = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
42   - - else
  40 + = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
  41 + - else
43 42 - if @milestone.new_record?
44 43 = link_to "Cancel", project_milestones_path(@project), :class => "btn"
45   - - else
  44 + - else
46 45 = link_to "Cancel", project_milestone_path(@project, @milestone), :class => "btn"
47 46  
48 47 :javascript
... ...
app/views/milestones/edit.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "form"
2 2  
3   -:javascript
4   - $(function(){
  3 +:javascript
  4 + $(function(){
5 5 $('select#issue_assignee_id').chosen();
6 6 });
7 7  
... ...
app/views/milestones/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -9,10 +9,10 @@
9 9 .title
10 10 %ul.nav.nav-pills
11 11 %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
12   - = link_to project_milestones_path(@project, :f => 0) do
  12 + = link_to project_milestones_path(@project, :f => 0) do
13 13 Active
14 14 %li{:class => ("active" if params[:f] == "1")}
15   - = link_to project_milestones_path(@project, :f => 1) do
  15 + = link_to project_milestones_path(@project, :f => 1) do
16 16 All
17 17  
18 18 %ul.unstyled
... ...
app/views/milestones/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -6,12 +6,12 @@
6 6 %span.right
7 7 = link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn edit-milestone-link small"
8 8 - if can?(current_user, :admin_milestone, @project)
9   - = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do
  9 + = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do
10 10 %i.icon-edit
11 11 Edit
12 12  
13 13 .back_link
14   - = link_to project_milestones_path(@project) do
  14 + = link_to project_milestones_path(@project) do
15 15 ← To milestones list
16 16  
17 17 .main_box
... ... @@ -19,7 +19,7 @@
19 19 %h5
20 20 - if @milestone.closed
21 21 .alert-message.error.status_info Closed
22   - - else
  22 + - else
23 23 .alert-message.success.status_info Open
24 24 = @milestone.title
25 25 %small.right= @milestone.expires_at
... ... @@ -48,7 +48,7 @@
48 48 - @issues.each do |issue|
49 49 %tr
50 50 %td
51   - = link_to [@project, issue] do
  51 + = link_to [@project, issue] do
52 52 = image_tag gravatar_icon(issue.assignee_email, 16), :width => "16"
53 53  
54 54 %span.badge.badge-info ##{issue.id}
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -14,12 +14,12 @@
14 14 .span4
15 15 %h5 Notify via email:
16 16 .clearfix
17   - = label_tag :notify do
  17 + = label_tag :notify do
18 18 = check_box_tag :notify, 1, @note.noteable_type != "Commit"
19 19 %span Project team
20 20  
21 21 - if @note.notify_only_author?(current_user)
22   - = label_tag :notify_author do
  22 + = label_tag :notify_author do
23 23 = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
24 24 %span Commit author
25 25 .span8
... ...
app/views/notes/_load.js.haml
  Diff comments   View file @3bd06d5
... ... @@ -11,7 +11,7 @@
11 11 :plain
12 12 NoteList.setContent(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
13 13  
14   -- else
  14 +- else
15 15 - if params[:first_id]
16 16 :plain
17 17 NoteList.append(#{params[:first_id]}, "");
... ...
app/views/notes/_per_line_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -15,19 +15,19 @@
15 15 = f.text_area :note, :size => 255
16 16 %h5 Notify via email:
17 17 .clearfix
18   - = label_tag :notify do
  18 + = label_tag :notify do
19 19 = check_box_tag :notify, 1, @note.noteable_type != "Commit"
20 20 %span Project team
21 21  
22 22 - if @note.notify_only_author?(current_user)
23   - = label_tag :notify_author do
  23 + = label_tag :notify_author do
24 24 = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
25 25 %span Commit author
26 26 .actions
27 27 = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
28 28 = link_to "Close", "#", :class => "btn hide-button"
29 29  
30   -:javascript
  30 +:javascript
31 31 $(function(){
32 32 $(".per_line_form .hide-button").bind("click", function(){
33 33 $('.per_line_form').hide();
... ...
app/views/notes/_per_line_show.html.haml
  Diff comments   View file @3bd06d5
1 1 %tr.line_notes_row
2   - %td{:colspan => 3}
  2 + %td{:colspan => 3}
3 3 %ul
4 4 = render :partial => "notes/show", :locals => {:note => note}
5 5  
... ...
app/views/notes/_reply_button.html.haml
  Diff comments   View file @3bd06d5
1 1 %tr.line_notes_row.reply
2   - %td{:colspan => 3}
3   - = link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line"
  2 + %td{:colspan => 3}
  3 + = link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line"
... ...
app/views/notes/create.js.haml
  Diff comments   View file @3bd06d5
1 1 - if @note.line_code
2 2 = render "create_line", :note => @note
3   -- else
  3 +- else
4 4 = render "create_common", :note => @note
5 5  
6 6 -# Enable submit button
... ...
app/views/profile/design.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -3,11 +3,11 @@
3 3 %h3 Application theme
4 4 %hr
5 5 .clearfix
6   - = label_tag do
  6 + = label_tag do
7 7 = f.radio_button :theme_id, 1
8 8 Default
9 9  
10   - = label_tag do
  10 + = label_tag do
11 11 = f.radio_button :theme_id, 2
12 12 Classic
13 13 %br
... ... @@ -29,8 +29,8 @@
29 29 = f.radio_button :dark_scheme, true
30 30 Dark code preview
31 31  
32   -:javascript
33   - $(function(){
  32 +:javascript
  33 + $(function(){
34 34 $(".edit_user input").bind("click", function() {
35 35 $(".edit_user").submit();
36 36 });
... ...
app/views/profile/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -50,10 +50,10 @@
50 50 You can change your avatar at gravatar.com
51 51  
52 52 %h4
53   - Personal projects:
  53 + Personal projects:
54 54 %small.right
55 55 %span= current_user.my_own_projects.count
56   - of
  56 + of
57 57 %span= current_user.projects_limit
58 58 .progress
59 59 .bar{:style => "width: #{current_user.projects_limit_percent}%;"}
... ... @@ -65,6 +65,5 @@
65 65  
66 66 = link_to "Add Public Key", new_key_path, :class => "btn small right"
67 67  
68   -
69 68 .form-actions
70 69 = f.submit 'Save', :class => "btn-primary btn"
... ...
app/views/profile/token.html.haml
  Diff comments   View file @3bd06d5
1   -%h3
  1 +%h3
2 2 Private token
3 3 %span.cred.right
4 4 keep it in secret!
... ...
app/views/projects/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -14,7 +14,7 @@
14 14 .alert.alert-info
15 15 %h5 Advanced settings:
16 16 .clearfix
17   - = f.label :path do
  17 + = f.label :path do
18 18 Git Clone
19 19 .input
20 20 .input-prepend
... ... @@ -22,19 +22,19 @@
22 22 = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
23 23 %span.add-on= ".git"
24 24 .clearfix
25   - = f.label :code do
  25 + = f.label :code do
26 26 URL
27 27 .input
28 28 .input-prepend
29 29 %span.add-on= web_app_url
30 30 = f.text_field :code, :placeholder => "example"
31 31  
32   - - unless @project.new_record? || @project.heads.empty?
  32 + - unless @project.new_record? || @project.heads.empty?
33 33 .clearfix
34 34 = f.label :default_branch, "Default Branch"
35 35 .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
36 36  
37   - - unless @project.new_record?
  37 + - unless @project.new_record?
38 38 .alert.alert-info
39 39 %h5 Features:
40 40  
... ... @@ -49,13 +49,13 @@
49 49 .clearfix
50 50 = f.label :wall_enabled, "Wall"
51 51 .input= f.check_box :wall_enabled
52   -
  52 +
53 53 .clearfix
54 54 = f.label :wiki_enabled, "Wiki"
55 55 .input= f.check_box :wiki_enabled
56   -
  56 +
57 57 %br
58   -
  58 +
59 59 .actions
60 60 = f.submit 'Save', :class => "btn primary"
61 61 = link_to 'Cancel', @project, :class => "btn"
... ...
app/views/projects/_new_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -13,7 +13,7 @@
13 13 .alert.alert-info
14 14 %h5 Advanced settings:
15 15 .clearfix
16   - = f.label :path do
  16 + = f.label :path do
17 17 Git Clone
18 18 .input
19 19 .input-prepend
... ... @@ -21,7 +21,7 @@
21 21 = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
22 22 %span.add-on= ".git"
23 23 .clearfix
24   - = f.label :code do
  24 + = f.label :code do
25 25 URL
26 26 .input
27 27 .input-prepend
... ...
app/views/projects/_project_head.html.haml
  Diff comments   View file @3bd06d5
1 1 %ul.nav.nav-tabs
2 2 %li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
3   - = link_to project_path(@project), :class => "activities-tab tab" do
  3 + = link_to project_path(@project), :class => "activities-tab tab" do
4 4 %i.icon-home
5 5 Show
6 6 %li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
7   - = link_to team_project_path(@project), :class => "team-tab tab" do
  7 + = link_to team_project_path(@project), :class => "team-tab tab" do
8 8 %i.icon-user
9 9 Team
10 10 %li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" }
11   - = link_to files_project_path(@project), :class => "files-tab tab " do
  11 + = link_to files_project_path(@project), :class => "files-tab tab " do
12 12 Attachments
13 13 %li{ :class => " #{'active' if (controller.controller_name == "snippets") }" }
14   - = link_to project_snippets_path(@project), :class => "snippets-tab tab" do
  14 + = link_to project_snippets_path(@project), :class => "snippets-tab tab" do
15 15 Snippets
16 16  
17 17 - if can? current_user, :admin_project, @project
18 18 %li.right{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
19   - = link_to project_deploy_keys_path(@project) do
  19 + = link_to project_deploy_keys_path(@project) do
20 20 %span
21 21 Deploy Keys
22 22 %li.right{:class => "#{'active' if controller.controller_name == "hooks" }"}
23   - = link_to project_hooks_path(@project) do
  23 + = link_to project_hooks_path(@project) do
24 24 %span
25 25 Hooks
26 26 %li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }
27   - = link_to edit_project_path(@project), :class => "stat-tab tab " do
  27 + = link_to edit_project_path(@project), :class => "stat-tab tab " do
28 28 %i.icon-edit
29 29 Edit
30   -
... ...
app/views/projects/_show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -6,8 +6,8 @@
6 6  
7 7 %a.btn{:href => project_commits_path(@project)} Commits
8 8 %strong.right
9   - = link_to project_path(@project) do
10   - Switch to project →
  9 + = link_to project_path(@project) do
  10 + Switch to project →
11 11 %br
12 12 .alert-message.block-message.warning
13 13 .input
... ...
app/views/projects/_team.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -10,7 +10,7 @@
10 10  
11 11 :javascript
12 12 $(function(){
13   - $('.repo-access-select, .project-access-select').live("change", function() {
  13 + $('.repo-access-select, .project-access-select').live("change", function() {
14 14 $(this.form).submit();
15 15 });
16 16 })
... ...
app/views/projects/empty.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -2,18 +2,18 @@
2 2 .alert-message.block-message.error
3 3 %ul
4 4 %li You have no ssh keys added to your profile.
5   - %li You wont be able to pull/push repository.
6   - %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
  5 + %li You wont be able to pull/push repository.
  6 + %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
7 7  
8 8 .alert-message.block-message.error
9 9 %ul.unstyled.alert_holder
10 10 %li You should push repository to proceed.
11   - %li After push you will be able to browse code, commits etc.
  11 + %li After push you will be able to browse code, commits etc.
12 12  
13 13 - bash_lexer = Pygments::Lexer[:bash]
14 14 %div.git-empty
15 15 %h3 Git global setup:
16   - - setup_str = ["git config --global user.name \"#{current_user.name}\"",
  16 + - setup_str = ["git config --global user.name \"#{current_user.name}\"",
17 17 "git config --global user.email \"#{current_user.email}\""].join("\n")
18 18 = preserve do
19 19 = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
... ... @@ -23,7 +23,7 @@
23 23 %h3 Create Repository
24 24 - repo_setup_str = ["mkdir #{@project.path}",
25 25 "cd #{@project.path}",
26   - "git init",
  26 + "git init",
27 27 "touch README",
28 28 "git add README",
29 29 "git commit -m 'first commit'",
... ...
app/views/projects/files.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -8,11 +8,11 @@
8 8 = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
9 9  
10 10 = note.attachment_identifier
11   - %td
  11 + %td
12 12 Added
13 13 = time_ago_in_words(note.created_at)
14 14 ago
15   -- else
  15 +- else
16 16 .alert-message.block-message
17 17 %p All files attached to project wall, issues etc will be displayed here
18 18  
... ...
app/views/projects/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -4,14 +4,14 @@
4 4 - if current_user.require_ssh_key?
5 5 .alert.alert-error.padded
6 6 %span
7   - You wont be able to pull/push project code unless you
  7 + You wont be able to pull/push project code unless you
8 8 %strong
9   - = link_to new_key_path, :class => "vlink" do
  9 + = link_to new_key_path, :class => "vlink" do
10 10 add new key
11 11 to your profile
12 12 - if @events.any?
13 13 = render @events
14   - - else
  14 + - else
15 15 .padded
16 16 %strong.cgray Projects activity will be displayed here
17 17 .side
... ... @@ -22,7 +22,7 @@
22 22 (#{@projects.total_count})
23 23 - if current_user.can_create_project?
24 24 %span.right
25   - = link_to new_project_path, :class => "btn very_small info" do
  25 + = link_to new_project_path, :class => "btn very_small info" do
26 26 %i.icon-plus
27 27 New Project
28 28 - @projects.each do |project|
... ... @@ -34,7 +34,7 @@
34 34 →
35 35 .bottom= paginate @projects, :theme => "gitlab"
36 36  
37   -- else
  37 +- else
38 38 %h3 Nothing here
39 39 %br
40 40 - if current_user.can_create_project?
... ... @@ -43,7 +43,7 @@
43 43 = current_user.projects_limit
44 44 projects. Click on link below to add a new one
45 45 .link_holder
46   - = link_to new_project_path, :class => "" do
47   - New Project »
48   - - else
  46 + = link_to new_project_path, :class => "" do
  47 + New Project »
  48 + - else
49 49 If you will be added to project - it will be displayed here
... ...
app/views/projects/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -4,7 +4,7 @@
4 4 .row
5 5 -#.span2
6 6 .back_link
7   - = link_to projects_path do
  7 + = link_to projects_path do
8 8 ← To projects list
9 9 .span7
10 10 .form-horizontal
... ... @@ -14,14 +14,14 @@
14 14 .span4.right
15 15 .right
16 16 - if can? current_user, :download_code, @project
17   - = link_to archive_project_repository_path(@project), :class => "btn small padded" do
  17 + = link_to archive_project_repository_path(@project), :class => "btn small padded" do
18 18 %i.icon-download-alt
19 19 Download
20 20 - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
21   - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
  21 + = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
22 22 Merge Request
23 23 - if @project.issues_enabled && can?(current_user, :write_issue, @project)
24   - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
  24 + = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
25 25 Issue
26 26  
27 27 - unless @events.blank?
... ...
app/views/projects/team.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "project_head"
2   -%h3
  2 +%h3
3 3 Team Members
4 4 %small (#{@project.users_projects.count})
5 5  
6 6 - if can? current_user, :admin_team_member, @project
7 7 .alert.alert-info
8   - = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
  8 + = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
9 9 New Team Member
10   - Read more about project permissions
  10 + Read more about project permissions
11 11 %strong= link_to "here", help_permissions_path, :class => "vlink"
12 12 %br
13   - To open team member profile - click on avatar.
  13 + To open team member profile - click on avatar.
14 14  
15 15  
16 16 = render :partial => "team", :locals => {:project => @project}
... ...
app/views/protected_branches/index.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "repositories/branches_head"
2 2  
3 3 .alert
4   - %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}.
5   - %p This ability allows:
  4 + %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}.
  5 + %p This ability allows:
6 6 %ul
7 7 %li keep stable branches secured
8 8 %li forced code review before merge to protected branches
... ... @@ -23,7 +23,6 @@
23 23  
24 24 = f.submit 'Protect', :class => "primary btn"
25 25  
26   -
27 26 - unless @branches.empty?
28 27 %table.admin-table
29 28 %thead
... ... @@ -48,9 +47,5 @@
48 47 - if can? current_user, :admin_project, @project
49 48 = link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
50 49  
51   -
52   -
53   -
54   -
55 50 :javascript
56 51 $('select#protected_branch_name').chosen();
... ...
app/views/refs/_head.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -5,6 +5,6 @@
5 5 = hidden_field_tag :destination, "tree"
6 6 = hidden_field_tag :path, params[:path]
7 7 %li{:class => "#{'active' if (controller.controller_name == "refs") }"}
8   - = link_to tree_project_ref_path(@project, @ref) do
  8 + = link_to tree_project_ref_path(@project, @ref) do
9 9 Source
10 10  
... ...
app/views/refs/_tree_item.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -8,7 +8,7 @@
8 8 = image_tag "file_txt.png"
9 9 - elsif content.image?
10 10 = image_tag "file_img.png"
11   - - else
  11 + - else
12 12 = image_tag "file_bin.png"
13 13 - else
14 14 = image_tag "file_dir.png"
... ...
app/views/refs/tree.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -2,6 +2,6 @@
2 2 #tree-holder= render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}
3 3  
4 4 :javascript
5   - $(function() {
  5 + $(function() {
6 6 Tree.init();
7 7 });
... ...
app/views/repositories/_branches_head.html.haml
  Diff comments   View file @3bd06d5
1 1 = render "commits/head"
2 2 %ul.nav.nav-pills
3 3 %li{:class => ("active" if current_page?(project_repository_path(@project)))}
4   - = link_to project_repository_path(@project) do
  4 + = link_to project_repository_path(@project) do
5 5 Recent
6 6 %li{:class => ("active" if current_page?(project_protected_branches_path(@project)))}
7   - = link_to project_protected_branches_path(@project) do
  7 + = link_to project_protected_branches_path(@project) do
8 8 Protected
9 9 %li{:class => ("active" if current_page?(branches_project_repository_path(@project)))}
10   - = link_to branches_project_repository_path(@project) do
  10 + = link_to branches_project_repository_path(@project) do
11 11 All
... ...
app/views/repositories/_feed.html.haml
  Diff comments   View file @3bd06d5
1 1 - commit = update
2 2 %tr
3 3 %td
4   - = link_to project_commits_path(@project, :ref => commit.head.name) do
  4 + = link_to project_commits_path(@project, :ref => commit.head.name) do
5 5 %strong
6 6 = commit.head.name
7 7 - if commit.head.name == @project.root_ref
... ...
app/views/repositories/tags.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -26,5 +26,5 @@
26 26 - if can? current_user, :download_code, @project
27 27 = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "visible_link download_repo_link"
28 28  
29   -- else
  29 +- else
30 30 %h3 No tags
... ...
app/views/search/show.html.haml
  Diff comments   View file @3bd06d5
1 1 = form_tag search_path, :method => :get do |f|
2 2 .padded
3   - = label_tag :search do
  3 + = label_tag :search do
4 4 %strong Looking for
5 5 .input
6 6 = text_field_tag :search, params[:search],:placeholder => "issue 143", :class => "input-xxlarge"
... ... @@ -13,30 +13,30 @@
13 13 - if @projects.empty? && @merge_requests.empty?
14 14 %h3
15 15 %small Nothing here
16   - - else
  16 + - else
17 17 - if @projects.any?
18 18 %h4 Projects
19 19 .padded
20 20 - @projects.each do |project|
21   - = link_to project do
  21 + = link_to project do
22 22 %h4
23 23 %span.ico.project
24 24 = project.name
25 25 %small
26   - last activity at
  26 + last activity at
27 27 = project.last_activity_date.stamp("Aug 25, 2011")
28 28 - if @merge_requests.any?
29 29 %h4 Merge Requests
30 30 .padded
31 31 - @merge_requests.each do |merge_request|
32   - = link_to [merge_request.project, merge_request] do
  32 + = link_to [merge_request.project, merge_request] do
33 33 %h5
34 34 Merge Request #
35 35 = merge_request.id
36 36 –
37 37 = truncate merge_request.title, :length => 50
38 38 %small
39   - updated at
  39 + updated at
40 40 = merge_request.updated_at.stamp("Aug 25, 2011")
41 41 %strong
42 42 %span.label= merge_request.project.name
... ... @@ -44,14 +44,14 @@
44 44 %h4 Issues
45 45 .padded
46 46 - @issues.each do |issue|
47   - = link_to [issue.project, issue] do
  47 + = link_to [issue.project, issue] do
48 48 %h5
49 49 Issue #
50 50 = issue.id
51 51 –
52 52 = truncate issue.title, :length => 50
53 53 %small
54   - updated at
  54 + updated at
55 55 = issue.updated_at.stamp("Aug 25, 2011")
56 56 %strong
57 57 %span.label= issue.project.name
... ...
app/views/snippets/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -29,8 +29,8 @@
29 29  
30 30  
31 31  
32   -:javascript
33   - $(function(){
  32 +:javascript
  33 + $(function(){
34 34 $('select#snippet_expires_at').chosen();
35 35 });
36 36  
... ...
app/views/snippets/index.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -2,11 +2,11 @@
2 2  
3 3 - if can? current_user, :write_snippet, @project
4 4 .alert-message.block-message
5   - = link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do
  5 + = link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do
6 6 Add new snippet
7 7 Share code pastes with others if it cant be in a git repository
8 8 %br
9   - To add new snippet - click on button.
  9 + To add new snippet - click on button.
10 10  
11 11 - unless @snippets.fresh.empty?
12 12 %table.zebra-striped.borders= render @snippets.fresh
... ...
app/views/team_members/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -22,7 +22,7 @@
22 22 = link_to "Cancel", team_project_path(@project), :class => "btn"
23 23  
24 24 :css
25   - form select {
  25 + form select {
26 26 width:300px;
27 27 }
28 28  
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -8,9 +8,9 @@
8 8 - if user.blocked
9 9 %span.label Blocked
10 10  
11   - = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
  11 + = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
12 12 = image_tag gravatar_icon(user.email, 40), :class => "avatar"
13   - = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
  13 + = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
14 14 %strong= truncate(user.name, :lenght => 40)
15 15 %br
16 16 %div.cgray= user.email
... ...
app/views/team_members/create.js.haml
  Diff comments   View file @3bd06d5
1 1 - if @team_member.valid?
2 2 :plain
3 3 $("#new_team_member").hide("slide", { direction: "right" }, 150, function(){
4   - $("#team-table").show("slide", { direction: "left" }, 150, function() {
  4 + $("#team-table").show("slide", { direction: "left" }, 150, function() {
5 5 $("#new_team_member").remove();
6 6 $("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}");
7 7 $(".add_new").show();
... ...
app/views/team_members/show.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -11,7 +11,7 @@
11 11 %hr
12 12 .back_link
13 13 %br
14   - = link_to team_project_path(@project), :class => "" do
  14 + = link_to team_project_path(@project), :class => "" do
15 15 ← To team list
16 16 %br
17 17 .row
... ... @@ -56,7 +56,7 @@
56 56  
57 57 :javascript
58 58 $(function(){
59   - $('.repo-access-select, .project-access-select').live("change", function() {
  59 + $('.repo-access-select, .project-access-select').live("change", function() {
60 60 $(this.form).submit();
61 61 });
62 62 })
... ...
app/views/wikis/_form.html.haml
  Diff comments   View file @3bd06d5
... ... @@ -7,10 +7,10 @@
7 7 %li= msg
8 8  
9 9 .alert-message.block-message.warning
10   - %p
11   - Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
  10 + %p
  11 + Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
12 12 %br
13   - To add link to new page you can just type
  13 + To add link to new page you can just type
14 14 %code [Link Title](page-slug)
15 15 .clearfix
16 16 = f.label :title
... ...