diff options
| author | Andrey Vakarev <avakarev@gmail.com> | 2012-06-04 01:37:27 +0300 |
|---|---|---|
| committer | Andrey Vakarev <avakarev@gmail.com> | 2012-06-04 01:37:27 +0300 |
| commit | 3bd06d55e0c7e0accf9efd2e0d67cf1ae76f7b0d (patch) | |
| tree | f492c34aeacd1a5e3c4fc716155066f241943be5 | |
| parent | 7e0726b1da5c27f958eb940e99e5f8cc3e4a5853 (diff) | |
| download | gitlab-ce-3bd06d55e0c7e0accf9efd2e0d67cf1ae76f7b0d.tar.gz | |
Remove trailing whitespaces and trailing lines
80 files changed, 261 insertions, 296 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index b5b453d5185..0b0709ba4e0 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -4,7 +4,7 @@ %h5 Resque Workers .data.padded - = link_to "/info/resque" do + = link_to "/info/resque" do %h1{:class => @workers.present? ? "cgreen" : "cred"} = @workers.count %hr @@ -16,7 +16,7 @@ .ui-box %h5 Projects .data.padded - = link_to admin_projects_path do + = link_to admin_projects_path do %h1= Project.count %hr = link_to 'New Project', new_admin_project_path, :class => "btn small" @@ -24,7 +24,7 @@ .ui-box %h5 Users .data.padded - = link_to admin_users_path do + = link_to admin_users_path do %h1= User.count %hr = link_to 'New User', new_admin_user_path, :class => "btn small" diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index 4a2d01e19b6..822dc06439c 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -9,14 +9,14 @@ = f.label :name .input= f.text_field :name .clearfix - = f.label :path do + = f.label :path do Path .input .input-prepend %span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:" = f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record? .clearfix - = f.label :code do + = f.label :code do Code .input .input-prepend @@ -28,7 +28,7 @@ = f.label :owner_id .input= f.select :owner_id, User.all.map { |user| [user.name, user.id] } - - if @admin_project.repo_exists? + - if @admin_project.repo_exists? .clearfix = f.label :default_branch, "Default Branch" .input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;") diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index f26ddf2b06f..e4f19e1ccc0 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -1,4 +1,4 @@ -%h3 +%h3 Projects = link_to 'New Project', new_admin_project_path, :class => "btn small right" %br diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 90ed8ea944f..8ba2943e7f9 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -9,7 +9,7 @@ %b Name: %td - = @admin_project.name + = @admin_project.name %tr %td %b @@ -59,7 +59,7 @@ %br %h3 Add new team member %br -= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do += form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do %table.zebra-striped.table-bordered %thead %tr @@ -73,11 +73,11 @@ %tr %td= submit_tag 'Add', :class => "btn primary" %td - Read more about project permissions + Read more about project permissions %strong= link_to "here", help_permissions_path, :class => "vlink" -:css - form select { +:css + form select { width:150px; } @@ -85,9 +85,7 @@ width:300px; } - -:javascript +:javascript $('select#user_ids').chosen(); $('select#repo_access').chosen(); $('select#project_access').chosen(); - diff --git a/app/views/admin/team_members/_form.html.haml b/app/views/admin/team_members/_form.html.haml index 0bf9020f748..034757620ec 100644 --- a/app/views/admin/team_members/_form.html.haml +++ b/app/views/admin/team_members/_form.html.haml @@ -16,7 +16,7 @@ = link_to 'Cancel', :back, :class => "btn" :css - form select { + form select { width:300px; } @@ -25,4 +25,3 @@ $('select#team_member_project_id').chosen(); $('select#team_member_repo_access').chosen(); $('select#team_member_project_access').chosen(); - diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 13325986907..ea7b3130917 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -1,11 +1,11 @@ -%h3 +%h3 Users = link_to 'New User', new_admin_user_path, :class => "btn small right" %br %ul.nav.nav-pills %li{:class => "#{'active' unless params[:filter]}"} - = link_to "Active", admin_users_path + = link_to "Active", admin_users_path %li{:class => "#{'active' if params[:filter] == "admins"}"} = link_to admin_users_path(:filter => "admins") do Admins @@ -34,9 +34,9 @@ %td= user.users_projects.count %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}", :class => "btn small" %td - - if user.blocked + - if user.blocked = link_to 'Unblock', unblock_admin_user_path(user), :method => :put, :class => "btn small success" - - else + - else = link_to 'Block', block_admin_user_path(user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger" %td= link_to 'Destroy', [:admin, user], :confirm => 'USER WILL BE REMOVED! Are you sure?', :method => :delete, :class => "btn small danger" diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 060dd0c76ce..7510b1446dc 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -53,11 +53,10 @@ %td = @admin_user.twitter - %br %h3 Add User to Projects %br -= form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do += form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do %table.table-bordered %thead %tr @@ -71,7 +70,7 @@ %tr %td= submit_tag 'Add', :class => "btn primary" %td - Read more about project permissions + Read more about project permissions %strong= link_to "here", help_permissions_path, :class => "vlink" %br @@ -95,8 +94,8 @@ %td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small" %td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger" -:css - form select { +:css + form select { width:150px; } @@ -104,9 +103,7 @@ width:300px; } - -:javascript +:javascript $('select#project_ids').chosen(); $('select#repo_access').chosen(); $('select#project_access').chosen(); - diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml index c304343bcb3..b28a435fbc3 100644 --- a/app/views/commits/_diffs.html.haml +++ b/app/views/commits/_diffs.html.haml @@ -1,19 +1,17 @@ - if @suppress_diff .alert-message.block-message - %p - %strong Warning! Large commit with more then 200 files changed. + %p + %strong Warning! Large commit with more then 200 files changed. %p To prevent performance issue we rejected diff information. - %p - But if you still want to see diff - = link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark" - + %p + But if you still want to see diff + = link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark" %p.cgray Showing #{pluralize(diffs.count, "changed file")} .file_stats = render "commits/diff_head", :diffs => diffs - - unless @suppress_diff - diffs.each_with_index do |diff, i| - next if diff.diff.empty? @@ -39,4 +37,3 @@ - else %p %center No preview for this file type - diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index 6c261137f1f..8e9195c5b50 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -5,18 +5,18 @@ = hidden_field_tag :destination, "commits" %li{:class => "#{'active' if current_page?(project_commits_path(@project)) }"} - = link_to project_commits_path(@project) do + = link_to project_commits_path(@project) do Commits %li{:class => "#{'active' if current_page?(compare_project_commits_path(@project)) }"} - = link_to compare_project_commits_path(@project) do + = link_to compare_project_commits_path(@project) do Compare %li{:class => "#{branches_tab_class}"} - = link_to project_repository_path(@project) do + = link_to project_repository_path(@project) do Branches %span.number= @project.repo.branch_count %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"} - = link_to tags_project_repository_path(@project) do + = link_to tags_project_repository_path(@project) do Tags %span.number= @project.repo.tag_count @@ -24,10 +24,9 @@ - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right %span.rss-icon - = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do = image_tag "rss_ui.png", :title => "feed" - :javascript $(function(){ $('.project-refs-select').chosen(); diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index ec5e712c6fe..e5173b00ed7 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -9,14 +9,14 @@ %td.old_line= "..." %td.new_line= "..." %td.line_content.matched= line - - else + - else %td.old_line = link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code - if @comments_allowed - = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line" + = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line" %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} " - + - if @comments_allowed - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse - unless comments.empty? diff --git a/app/views/commits/compare.html.haml b/app/views/commits/compare.html.haml index 493b47ca75b..c02263296f4 100644 --- a/app/views/commits/compare.html.haml +++ b/app/views/commits/compare.html.haml @@ -1,20 +1,20 @@ = render "head" -%h3 +%h3 Compare View %hr %div - %p - Fill input field with commit id like + %p + Fill input field with commit id like %code '4eedf23' - or branch/tag name like - %code master + or branch/tag name like + %code master & press compare button for commits list, code diff. %br - = form_tag compare_project_commits_path(@project), :method => :get do + = form_tag compare_project_commits_path(@project), :method => :get do .clearfix = text_field_tag :from, params[:from], :placeholder => "master", :class => "xlarge" = "..." @@ -31,7 +31,6 @@ %h4 Diff = render "commits/diffs", :diffs => @diffs - :javascript $(function() { var availableTags = #{@project.heads.map(&:name).to_json}; diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml index 9ac2762b4bc..385b4357e4e 100644 --- a/app/views/commits/index.html.haml +++ b/app/views/commits/index.html.haml @@ -6,7 +6,7 @@ %span.arrow = link_to project_commits_path(@project) do = @project.name - %span.divider + %span.divider \/ %li %a{:href => "#"}= params[:path].split("/").join(" / ") diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index d177b905977..0365e6584a8 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -38,11 +38,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; }); }); diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index 7dc769b5341..19899de3cf6 100644 --- a/app/views/deploy_keys/index.html.haml +++ b/app/views/deploy_keys/index.html.haml @@ -1,9 +1,9 @@ = render "repositories/head" - if can? current_user, :admin_project, @project .alert-message.block-message - Deploy keys allow read-only access to repository. - = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do - Add Deploy Key + Deploy keys allow read-only access to repository. + = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do + Add Deploy Key - if @keys.any? %table diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml index c5cd2dd5c8b..0ffbadeb08d 100644 --- a/app/views/errors/encoding.html.haml +++ b/app/views/errors/encoding.html.haml @@ -1,6 +1,6 @@ .alert-message.block-message.error %h3 Encoding Error %hr - %p + %p Page cant be loaded cause of encoding error diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml index 172bd4e678a..b2399ac51dc 100644 --- a/app/views/errors/git_not_found.html.haml +++ b/app/views/errors/git_not_found.html.haml @@ -1,9 +1,9 @@ .alert-message.block-message.error %h3 Git Resource Not found %hr - %p - Application cant get access to some + %p + Application cant get access to some %span.label branch - or + or %span.label commit in your repository. Maybe it was moved diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index ed45e27a7b7..6321df6386c 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -1,8 +1,8 @@ - if event.allowed? .event_feed - - if event.issue? + - if event.issue? = render "events/event_issue", :event => event - - elsif event.merge_request? + - elsif event.merge_request? = render "events/event_merge_request", :event => event - elsif event.push? = render "events/event_push", :event => event diff --git a/app/views/events/_event_issue.html.haml b/app/views/events/_event_issue.html.haml index f527cb26391..13fb20cd379 100644 --- a/app/views/events/_event_issue.html.haml +++ b/app/views/events/_event_issue.html.haml @@ -1,10 +1,10 @@ = image_tag gravatar_icon(event.author_email), :class => "avatar" -%strong #{event.author_name} +%strong #{event.author_name} %span.event_label= event.action_name - issue + issue = link_to project_issue_path(event.project, event.issue) do %strong= truncate event.issue_title -at +at %strong= link_to event.project.name, event.project %span.cgray = time_ago_in_words(event.created_at) diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml index 5c1c66e0afb..e59a74b9554 100644 --- a/app/views/events/_event_merge_request.html.haml +++ b/app/views/events/_event_merge_request.html.haml @@ -1,12 +1,12 @@ - if event.action_name == "merged" .event_icon= image_tag "event_mr_merged.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" -%strong #{event.author_name} +%strong #{event.author_name} %span.event_label= event.action_name - merge request + merge request = link_to project_merge_request_path(event.project, event.merge_request) do %strong= truncate event.merge_request_title -at +at %strong= link_to event.project.name, event.project %span.cgray = time_ago_in_words(event.created_at) diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml index aff66385681..13ef0f8f839 100644 --- a/app/views/events/_event_push.html.haml +++ b/app/views/events/_event_push.html.haml @@ -1,12 +1,12 @@ %div .event_icon= image_tag "event_push.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" - %strong #{event.author_name} + %strong #{event.author_name} %span.event_label= event.push_action_name = event.ref_type = link_to project_commits_path(event.project, :ref => event.ref_name) do %strong= event.ref_name - at + at %strong= link_to event.project.name, event.project %span.cgray = time_ago_in_words(event.created_at) @@ -14,9 +14,9 @@ - if event.push_with_commits? - if event.commits_count > 1 - = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do + = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do %strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]} - - project = event.project + - project = event.project %ul.unstyled.event_commits - if event.commits_count > 3 - event.commits[0...2].each do |commit| @@ -24,7 +24,6 @@ %li %br \... and #{event.commits_count - 2} more commits - - else + - else - event.commits.each do |commit| = render "events/commit", :commit => commit, :project => project - diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 88f8d7b8ac8..d12b192bff2 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -1,9 +1,9 @@ -%h3.cgray +%h3.cgray GITLAB %span.right v2.5 %hr %h4 Self Hosted Git Management -%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. +%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. %hr diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml index 84c6a0c051a..2db69bd76d9 100644 --- a/app/views/help/web_hooks.html.haml +++ b/app/views/help/web_hooks.html.haml @@ -1,7 +1,7 @@ %h3 Web hooks %br -%p Application will send POST request with some data like example below: +%p Application will send POST request with some data like example below: %h5 Hooks request example: .borders= render "hooks/data_ex" diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml index 4785b367e65..945ab878d73 100644 --- a/app/views/help/workflow.html.haml +++ b/app/views/help/workflow.html.haml @@ -6,33 +6,33 @@ %li %p Clone project .bash - %pre + %pre git clone git@example.com:project-name.git %li %p Create branch with your feature .bash - %pre + %pre git checkout -b $feature_name %li %p Write code. Commit changes .bash - %pre + %pre git commit -am "My feature is ready" %li %p Push your branch to gitlabhq .bash - %pre + %pre git push origin $feature_name - %li + %li %p Review your code on Commits page - %li + %li %p Create a merge request - %li + %li %p Your team lead will review code & merge it to main branch diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml index d81cce763d6..15699fc4390 100644 --- a/app/views/hooks/index.html.haml +++ b/app/views/hooks/index.html.haml @@ -5,7 +5,7 @@ %span Post receive hooks for binding events when someone push to repository. %br - Read more about web hooks + Read more about web hooks %strong #{link_to "here", help_web_hooks_path, :class => "vlink"} = form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do |f| @@ -30,7 +30,7 @@ %tr %th URL %th Method - %th + %th - @hooks.each do |hook| %tr %td @@ -40,4 +40,3 @@ %td POST %td = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right" - diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 2eb0908a9e7..4dcba4fb657 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -24,7 +24,7 @@ .clearfix = f.label :critical, "Critical" .input= f.check_box :critical - + - unless @issue.new_record? .clearfix = f.label :closed @@ -35,8 +35,6 @@ = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14 %p.hint Markdown is enabled. - - .actions - if @issue.new_record? = f.submit 'Submit new issue', :class => "primary btn" @@ -44,9 +42,9 @@ = f.submit 'Save changes', :class => "primary btn" - if request.xhr? - = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" - - else + = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" + - else - if @issue.new_record? = link_to "Cancel", project_issues_path(@project), :class => "btn" - - else + - else = link_to "Cancel", project_issue_path(@project, @issue), :class => "btn" diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml index 157741dda04..701b0625852 100644 --- a/app/views/issues/_head.html.haml +++ b/app/views/issues/_head.html.haml @@ -1,11 +1,11 @@ %ul.nav.nav-tabs %li{:class => "#{'active' if current_page?(project_issues_path(@project))}"} - = link_to project_issues_path(@project), :class => "tab" do - Browse Issues + = link_to project_issues_path(@project), :class => "tab" do + Browse Issues %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} - = link_to project_milestones_path(@project), :class => "tab" do - Milestones + = link_to project_milestones_path(@project), :class => "tab" do + Milestones %li.right %span.rss-icon - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do = image_tag "rss_ui.png", :title => "feed" diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index a4f8d338ba4..bb7c81f9a8e 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -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 - else = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small padded", :remote => true - = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do + = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do %i.icon-edit Edit @@ -22,11 +22,5 @@ - if issue.upvotes > 0 %span.label.success= "+#{issue.upvotes}" - - = link_to project_issue_path(issue.project, issue) do %p.row_title= truncate(issue.title, :length => 100) - - - - diff --git a/app/views/issues/edit.html.haml b/app/views/issues/edit.html.haml index aa0c931b34d..3c9877f842f 100644 --- a/app/views/issues/edit.html.haml +++ b/app/views/issues/edit.html.haml @@ -1,7 +1,7 @@ = render "form" -:javascript - $(function(){ +:javascript + $(function(){ $('select#issue_assignee_id').chosen(); $('select#issue_milestone_id').chosen(); }); diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 86fd6a4add2..511957325e0 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -6,7 +6,7 @@ .right .span5 - if can? current_user, :write_issue, @project - = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do + = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do New Issue = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do = hidden_field_tag :project_id, @project.id, { :id => 'project_id' } @@ -20,16 +20,16 @@ .span6 %ul.nav.nav-pills.left %li{:class => ("active" if (params[:f] == "0" || !params[:f]))} - = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do + = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do Open %li{:class => ("active" if params[:f] == "2")} - = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do + = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do Closed %li{:class => ("active" if params[:f] == "3")} - = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do + = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do To Me %li{:class => ("active" if params[:f] == "1")} - = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do + = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do All .span4.right diff --git a/app/views/issues/new.html.haml b/app/views/issues/new.html.haml index aa0c931b34d..3c9877f842f 100644 --- a/app/views/issues/new.html.haml +++ b/app/views/issues/new.html.haml @@ -1,7 +1,7 @@ = render "form" -:javascript - $(function(){ +:javascript + $(function(){ $('select#issue_assignee_id').chosen(); $('select#issue_milestone_id').chosen(); }); diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 314cfefd7fe..4b94339d3e3 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -1,7 +1,7 @@ %h3 Issue ##{@issue.id} %small - created at + created at = @issue.created_at.stamp("Aug 21, 2011") %span.right @@ -11,7 +11,7 @@ - else = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue" - if can?(current_user, :admin_project, @project) || @issue.author == current_user - = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do + = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do %i.icon-edit Edit @@ -20,7 +20,7 @@ .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}" .back_link - = link_to project_issues_path(@project) do + = link_to project_issues_path(@project) do ← To issues list .main_box @@ -28,7 +28,7 @@ %h4 - if @issue.closed .alert-message.error.status_info Closed - - else + - else .alert-message.success.status_info Open = @issue.title @@ -37,17 +37,17 @@ = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" %strong.author= link_to_issue_author(@issue) - %cite.cgray and currently assigned to + %cite.cgray and currently assigned to = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av" %strong.author= link_to_issue_assignee(@issue) - - if @issue.milestone + - if @issue.milestone - milestone = @issue.milestone - %cite.cgray and attached to milestone + %cite.cgray and attached to milestone = link_to project_milestone_path(milestone.project, milestone) do %strong = truncate(milestone.title, :length => 20) - + - if @issue.description.present? .bottom_box_content = preserve do diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml index 61b558a27f5..565cc800a8f 100644 --- a/app/views/keys/index.html.haml +++ b/app/views/keys/index.html.haml @@ -1,7 +1,7 @@ -%h3 +%h3 SSH Keys = link_to "Add new", new_key_path, :class => "btn small right" - + %br %table#keys-table.admin-table diff --git a/app/views/keys/show.html.haml b/app/views/keys/show.html.haml index 540c98c0675..75b703ba893 100644 --- a/app/views/keys/show.html.haml +++ b/app/views/keys/show.html.haml @@ -1,16 +1,14 @@ %h3 - Public key: + Public key: = @key.title %small - created at + created at = @key.created_at.stamp("Aug 21, 2011") .back_link - = link_to keys_path do + = link_to keys_path do ← To keys list %hr %pre= @key.key .actions = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key" - - diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml index 8b856a0cb3a..c0e3e8a39a1 100644 --- a/app/views/layouts/_app_menu.html.haml +++ b/app/views/layouts/_app_menu.html.haml @@ -1,11 +1,11 @@ %nav.main_menu = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home" - = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do + = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do Issues %span.count= current_user.assigned_issues.opened.count = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do Requests %span.count= current_user.cared_merge_requests.count - = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do + = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do Search = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}" diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index cdb4ebf4a19..9e019021c89 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -3,8 +3,8 @@ .container .top_panel_content %div.app_logo - = link_to root_path, :class => "home", :title => "Home" do - %h1 + = link_to root_path, :class => "home", :title => "Home" do + %h1 GITLAB %span.separator %h1.project_name= title @@ -13,11 +13,11 @@ = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" .fbtn - if current_user.is_admin? - = link_to admin_root_path, :class => "btn small", :title => "Admin area" do + = link_to admin_root_path, :class => "btn small", :title => "Admin area" do %i.icon-cog Admin - if current_user.can_create_project? - = link_to new_project_path, :class => "btn small", :title => "Create New Project" do + = link_to new_project_path, :class => "btn small", :title => "Create New Project" do %i.icon-plus Project .account-box @@ -43,4 +43,3 @@ } }); }); - diff --git a/app/views/layouts/_project_menu.html.haml b/app/views/layouts/_project_menu.html.haml index 00da49accad..268cca487b7 100644 --- a/app/views/layouts/_project_menu.html.haml +++ b/app/views/layouts/_project_menu.html.haml @@ -2,14 +2,14 @@ = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project" - if @project.repo_exists? - if can? current_user, :download_code, @project - = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do + = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do Files = link_to "Commits", project_commits_path(@project), :class => commit_tab_class = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil - if @project.issues_enabled = link_to project_issues_filter_path(@project), :class => issues_tab? ? "current" : nil do - Issues + Issues %span.count= @project.issues.opened.count - if @project.merge_requests_enabled = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do @@ -19,7 +19,7 @@ - if @project.wall_enabled = link_to wall_project_path(@project), :class => wall_tab? ? "current" : nil do Wall - + - if @project.wiki_enabled = link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do Wiki diff --git a/app/views/merge_requests/_commits.html.haml b/app/views/merge_requests/_commits.html.haml index b6f66fb424e..441a7f32ef4 100644 --- a/app/views/merge_requests/_commits.html.haml +++ b/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 diff --git a/app/views/merge_requests/_diffs.html.haml b/app/views/merge_requests/_diffs.html.haml index bd904a77094..27554a775d1 100644 --- a/app/views/merge_requests/_diffs.html.haml +++ b/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 diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml index f2ddc9a50e0..3d6febc6b7b 100644 --- a/app/views/merge_requests/_form.html.haml +++ b/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() }); }); }); diff --git a/app/views/merge_requests/_head.html.haml b/app/views/merge_requests/_head.html.haml index 3d847b302ae..c578c794060 100644 --- a/app/views/merge_requests/_head.html.haml +++ b/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 diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index c49df6bb4d7..3ec2b10bf7b 100644 --- a/app/views/merge_requests/index.html.haml +++ b/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 diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 84741171198..8793280702c 100644 --- a/app/views/merge_requests/show.html.haml +++ b/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; }); }); diff --git a/app/views/milestones/_form.html.haml b/app/views/milestones/_form.html.haml index 46d7daf96b8..69567eff417 100644 --- a/app/views/milestones/_form.html.haml +++ b/app/views/milestones/_form.html.haml @@ -1,6 +1,6 @@ %h3= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" .back_link - = link_to project_milestones_path(@project) do + = link_to project_milestones_path(@project) do ← To milestones %hr @@ -30,7 +30,6 @@ .controls .datepicker - .form-actions - if @milestone.new_record? = f.submit 'Create milestone', :class => "primary btn" @@ -38,11 +37,11 @@ = f.submit 'Save changes', :class => "primary btn" - if request.xhr? - = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" - - else + = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" + - else - if @milestone.new_record? = link_to "Cancel", project_milestones_path(@project), :class => "btn" - - else + - else = link_to "Cancel", project_milestone_path(@project, @milestone), :class => "btn" :javascript diff --git a/app/views/milestones/edit.html.haml b/app/views/milestones/edit.html.haml index bada72459c9..af975a84a49 100644 --- a/app/views/milestones/edit.html.haml +++ b/app/views/milestones/edit.html.haml @@ -1,7 +1,7 @@ = render "form" -:javascript - $(function(){ +:javascript + $(function(){ $('select#issue_assignee_id').chosen(); }); diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml index faa87e02a67..58d25874bd5 100644 --- a/app/views/milestones/index.html.haml +++ b/app/views/milestones/index.html.haml @@ -9,10 +9,10 @@ .title %ul.nav.nav-pills %li{:class => ("active" if (params[:f] == "0" || !params[:f]))} - = link_to project_milestones_path(@project, :f => 0) do + = link_to project_milestones_path(@project, :f => 0) do Active %li{:class => ("active" if params[:f] == "1")} - = link_to project_milestones_path(@project, :f => 1) do + = link_to project_milestones_path(@project, :f => 1) do All %ul.unstyled diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index b41e4139ad9..dccfe625dd1 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -6,12 +6,12 @@ %span.right = link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn edit-milestone-link small" - if can?(current_user, :admin_milestone, @project) - = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do + = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do %i.icon-edit Edit .back_link - = link_to project_milestones_path(@project) do + = link_to project_milestones_path(@project) do ← To milestones list .main_box @@ -19,7 +19,7 @@ %h5 - if @milestone.closed .alert-message.error.status_info Closed - - else + - else .alert-message.success.status_info Open = @milestone.title %small.right= @milestone.expires_at @@ -48,7 +48,7 @@ - @issues.each do |issue| %tr %td - = link_to [@project, issue] do + = link_to [@project, issue] do = image_tag gravatar_icon(issue.assignee_email, 16), :width => "16" %span.badge.badge-info ##{issue.id} diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index 74ffbecbee5..03774d160b9 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -14,12 +14,12 @@ .span4 %h5 Notify via email: .clearfix - = label_tag :notify do + = label_tag :notify do = check_box_tag :notify, 1, @note.noteable_type != "Commit" %span Project team - if @note.notify_only_author?(current_user) - = label_tag :notify_author do + = label_tag :notify_author do = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" %span Commit author .span8 diff --git a/app/views/notes/_load.js.haml b/app/views/notes/_load.js.haml index fa373145298..1f3559670d1 100644 --- a/app/views/notes/_load.js.haml +++ b/app/views/notes/_load.js.haml @@ -11,7 +11,7 @@ :plain NoteList.setContent(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}"); -- else +- else - if params[:first_id] :plain NoteList.append(#{params[:first_id]}, ""); diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml index e8558cbd15a..94c558029d2 100644 --- a/app/views/notes/_per_line_form.html.haml +++ b/app/views/notes/_per_line_form.html.haml @@ -15,19 +15,19 @@ = f.text_area :note, :size => 255 %h5 Notify via email: .clearfix - = label_tag :notify do + = label_tag :notify do = check_box_tag :notify, 1, @note.noteable_type != "Commit" %span Project team - if @note.notify_only_author?(current_user) - = label_tag :notify_author do + = label_tag :notify_author do = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" %span Commit author .actions = f.submit 'Add note', :class => "btn primary", :id => "submit_note" = link_to "Close", "#", :class => "btn hide-button" -:javascript +:javascript $(function(){ $(".per_line_form .hide-button").bind("click", function(){ $('.per_line_form').hide(); diff --git a/app/views/notes/_per_line_show.html.haml b/app/views/notes/_per_line_show.html.haml index 45e6825e9cb..e239c618b11 100644 --- a/app/views/notes/_per_line_show.html.haml +++ b/app/views/notes/_per_line_show.html.haml @@ -1,5 +1,5 @@ %tr.line_notes_row - %td{:colspan => 3} + %td{:colspan => 3} %ul = render :partial => "notes/show", :locals => {:note => note} diff --git a/app/views/notes/_reply_button.html.haml b/app/views/notes/_reply_button.html.haml index f53b8c8d364..f03ba4d7018 100644 --- a/app/views/notes/_reply_button.html.haml +++ b/app/views/notes/_reply_button.html.haml @@ -1,3 +1,3 @@ %tr.line_notes_row.reply - %td{:colspan => 3} - = link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line" + %td{:colspan => 3} + = link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line" diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml index 67110340001..e87dbcf63c1 100644 --- a/app/views/notes/create.js.haml +++ b/app/views/notes/create.js.haml @@ -1,6 +1,6 @@ - if @note.line_code = render "create_line", :note => @note -- else +- else = render "create_common", :note => @note -# Enable submit button diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml index a4b40d03899..1942e83d7a2 100644 --- a/app/views/profile/design.html.haml +++ b/app/views/profile/design.html.haml @@ -3,11 +3,11 @@ %h3 Application theme %hr .clearfix - = label_tag do + = label_tag do = f.radio_button :theme_id, 1 Default - = label_tag do + = label_tag do = f.radio_button :theme_id, 2 Classic %br @@ -29,8 +29,8 @@ = f.radio_button :dark_scheme, true Dark code preview -:javascript - $(function(){ +:javascript + $(function(){ $(".edit_user input").bind("click", function() { $(".edit_user").submit(); }); diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index 892cfbf5ec1..5a343c33981 100644 --- a/app/views/profile/show.html.haml +++ b/app/views/profile/show.html.haml @@ -50,10 +50,10 @@ You can change your avatar at gravatar.com %h4 - Personal projects: + Personal projects: %small.right %span= current_user.my_own_projects.count - of + of %span= current_user.projects_limit .progress .bar{:style => "width: #{current_user.projects_limit_percent}%;"} @@ -65,6 +65,5 @@ = link_to "Add Public Key", new_key_path, :class => "btn small right" - .form-actions = f.submit 'Save', :class => "btn-primary btn" diff --git a/app/views/profile/token.html.haml b/app/views/profile/token.html.haml index c277adf98e9..199a4e02b92 100644 --- a/app/views/profile/token.html.haml +++ b/app/views/profile/token.html.haml @@ -1,4 +1,4 @@ -%h3 +%h3 Private token %span.cred.right keep it in secret! diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 932ed04d11e..36923bedc7b 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -14,7 +14,7 @@ .alert.alert-info %h5 Advanced settings: .clearfix - = f.label :path do + = f.label :path do Git Clone .input .input-prepend @@ -22,19 +22,19 @@ = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? %span.add-on= ".git" .clearfix - = f.label :code do + = f.label :code do URL .input .input-prepend %span.add-on= web_app_url = f.text_field :code, :placeholder => "example" - - unless @project.new_record? || @project.heads.empty? + - unless @project.new_record? || @project.heads.empty? .clearfix = f.label :default_branch, "Default Branch" .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;") - - unless @project.new_record? + - unless @project.new_record? .alert.alert-info %h5 Features: @@ -49,13 +49,13 @@ .clearfix = f.label :wall_enabled, "Wall" .input= f.check_box :wall_enabled - + .clearfix = f.label :wiki_enabled, "Wiki" .input= f.check_box :wiki_enabled - + %br - + .actions = f.submit 'Save', :class => "btn primary" = link_to 'Cancel', @project, :class => "btn" diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml index 240ee884783..e420f700948 100644 --- a/app/views/projects/_new_form.html.haml +++ b/app/views/projects/_new_form.html.haml @@ -13,7 +13,7 @@ .alert.alert-info %h5 Advanced settings: .clearfix - = f.label :path do + = f.label :path do Git Clone .input .input-prepend @@ -21,7 +21,7 @@ = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? %span.add-on= ".git" .clearfix - = f.label :code do + = f.label :code do URL .input .input-prepend diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml index 3d46a676a6d..f3ac3c27ccf 100644 --- a/app/views/projects/_project_head.html.haml +++ b/app/views/projects/_project_head.html.haml @@ -1,30 +1,29 @@ %ul.nav.nav-tabs %li{ :class => "#{'active' if current_page?(project_path(@project)) }" } - = link_to project_path(@project), :class => "activities-tab tab" do + = link_to project_path(@project), :class => "activities-tab tab" do %i.icon-home Show %li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" } - = link_to team_project_path(@project), :class => "team-tab tab" do + = link_to team_project_path(@project), :class => "team-tab tab" do %i.icon-user Team %li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" } - = link_to files_project_path(@project), :class => "files-tab tab " do + = link_to files_project_path(@project), :class => "files-tab tab " do Attachments %li{ :class => " #{'active' if (controller.controller_name == "snippets") }" } - = link_to project_snippets_path(@project), :class => "snippets-tab tab" do + = link_to project_snippets_path(@project), :class => "snippets-tab tab" do Snippets - if can? current_user, :admin_project, @project %li.right{:class => "#{'active' if controller.controller_name == "deploy_keys"}"} - = link_to project_deploy_keys_path(@project) do + = link_to project_deploy_keys_path(@project) do %span Deploy Keys %li.right{:class => "#{'active' if controller.controller_name == "hooks" }"} - = link_to project_hooks_path(@project) do + = link_to project_hooks_path(@project) do %span Hooks %li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" } - = link_to edit_project_path(@project), :class => "stat-tab tab " do + = link_to edit_project_path(@project), :class => "stat-tab tab " do %i.icon-edit Edit - diff --git a/app/views/projects/_show.html.haml b/app/views/projects/_show.html.haml index edb9c1cefe6..c6755fa730a 100644 --- a/app/views/projects/_show.html.haml +++ b/app/views/projects/_show.html.haml @@ -6,8 +6,8 @@ %a.btn{:href => project_commits_path(@project)} Commits %strong.right - = link_to project_path(@project) do - Switch to project → + = link_to project_path(@project) do + Switch to project → %br .alert-message.block-message.warning .input diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml index 196c7b92db1..5839346052a 100644 --- a/app/views/projects/_team.html.haml +++ b/app/views/projects/_team.html.haml @@ -10,7 +10,7 @@ :javascript $(function(){ - $('.repo-access-select, .project-access-select').live("change", function() { + $('.repo-access-select, .project-access-select').live("change", function() { $(this.form).submit(); }); }) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 44411b71596..eef113e002b 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -2,18 +2,18 @@ .alert-message.block-message.error %ul %li You have no ssh keys added to your profile. - %li You wont be able to pull/push repository. - %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq. + %li You wont be able to pull/push repository. + %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq. .alert-message.block-message.error %ul.unstyled.alert_holder %li You should push repository to proceed. - %li After push you will be able to browse code, commits etc. + %li After push you will be able to browse code, commits etc. - bash_lexer = Pygments::Lexer[:bash] %div.git-empty %h3 Git global setup: - - setup_str = ["git config --global user.name \"#{current_user.name}\"", + - setup_str = ["git config --global user.name \"#{current_user.name}\"", "git config --global user.email \"#{current_user.email}\""].join("\n") = preserve do = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'}) @@ -23,7 +23,7 @@ %h3 Create Repository - repo_setup_str = ["mkdir #{@project.path}", "cd #{@project.path}", - "git init", + "git init", "touch README", "git add README", "git commit -m 'first commit'", diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml index 19252d423ee..d171b0d09a1 100644 --- a/app/views/projects/files.html.haml +++ b/app/views/projects/files.html.haml @@ -8,11 +8,11 @@ = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16 = note.attachment_identifier - %td + %td Added = time_ago_in_words(note.created_at) ago -- else +- else .alert-message.block-message %p All files attached to project wall, issues etc will be displayed here diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index e18f37e17f7..6b050e0c86d 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -4,14 +4,14 @@ - if current_user.require_ssh_key? .alert.alert-error.padded %span - You wont be able to pull/push project code unless you + You wont be able to pull/push project code unless you %strong - = link_to new_key_path, :class => "vlink" do + = link_to new_key_path, :class => "vlink" do add new key to your profile - if @events.any? = render @events - - else + - else .padded %strong.cgray Projects activity will be displayed here .side @@ -22,7 +22,7 @@ (#{@projects.total_count}) - if current_user.can_create_project? %span.right - = link_to new_project_path, :class => "btn very_small info" do + = link_to new_project_path, :class => "btn very_small info" do %i.icon-plus New Project - @projects.each do |project| @@ -34,7 +34,7 @@ → .bottom= paginate @projects, :theme => "gitlab" -- else +- else %h3 Nothing here %br - if current_user.can_create_project? @@ -43,7 +43,7 @@ = current_user.projects_limit projects. Click on link below to add a new one .link_holder - = link_to new_project_path, :class => "" do - New Project » - - else + = link_to new_project_path, :class => "" do + New Project » + - else If you will be added to project - it will be displayed here diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 88dce0d5d23..22fbd9d2e95 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -4,7 +4,7 @@ .row -#.span2 .back_link - = link_to projects_path do + = link_to projects_path do ← To projects list .span7 .form-horizontal @@ -14,14 +14,14 @@ .span4.right .right - if can? current_user, :download_code, @project - = link_to archive_project_repository_path(@project), :class => "btn small padded" do + = link_to archive_project_repository_path(@project), :class => "btn small padded" do %i.icon-download-alt Download - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do + = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do Merge Request - if @project.issues_enabled && can?(current_user, :write_issue, @project) - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do + = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do Issue - unless @events.blank? diff --git a/app/views/projects/team.html.haml b/app/views/projects/team.html.haml index b023e5bf94f..664d6c022da 100644 --- a/app/views/projects/team.html.haml +++ b/app/views/projects/team.html.haml @@ -1,16 +1,16 @@ = render "project_head" -%h3 +%h3 Team Members %small (#{@project.users_projects.count}) - if can? current_user, :admin_team_member, @project .alert.alert-info - = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do + = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do New Team Member - Read more about project permissions + Read more about project permissions %strong= link_to "here", help_permissions_path, :class => "vlink" %br - To open team member profile - click on avatar. + To open team member profile - click on avatar. = render :partial => "team", :locals => {:project => @project} diff --git a/app/views/protected_branches/index.html.haml b/app/views/protected_branches/index.html.haml index fa80a489774..bd1e9cebb1a 100644 --- a/app/views/protected_branches/index.html.haml +++ b/app/views/protected_branches/index.html.haml @@ -1,8 +1,8 @@ = render "repositories/branches_head" .alert - %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}. - %p This ability allows: + %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}. + %p This ability allows: %ul %li keep stable branches secured %li forced code review before merge to protected branches @@ -23,7 +23,6 @@ = f.submit 'Protect', :class => "primary btn" - - unless @branches.empty? %table.admin-table %thead @@ -48,9 +47,5 @@ - if can? current_user, :admin_project, @project = link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small" - - - - :javascript $('select#protected_branch_name').chosen(); diff --git a/app/views/refs/_head.html.haml b/app/views/refs/_head.html.haml index afec5af8580..16a0cddfa24 100644 --- a/app/views/refs/_head.html.haml +++ b/app/views/refs/_head.html.haml @@ -5,6 +5,6 @@ = hidden_field_tag :destination, "tree" = hidden_field_tag :path, params[:path] %li{:class => "#{'active' if (controller.controller_name == "refs") }"} - = link_to tree_project_ref_path(@project, @ref) do + = link_to tree_project_ref_path(@project, @ref) do Source diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml index 691a2b97369..fe2f7293347 100644 --- a/app/views/refs/_tree_item.html.haml +++ b/app/views/refs/_tree_item.html.haml @@ -8,7 +8,7 @@ = image_tag "file_txt.png" - elsif content.image? = image_tag "file_img.png" - - else + - else = image_tag "file_bin.png" - else = image_tag "file_dir.png" diff --git a/app/views/refs/tree.html.haml b/app/views/refs/tree.html.haml index 7d19280b820..b48f7f91782 100644 --- a/app/views/refs/tree.html.haml +++ b/app/views/refs/tree.html.haml @@ -2,6 +2,6 @@ #tree-holder= render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree} :javascript - $(function() { + $(function() { Tree.init(); }); diff --git a/app/views/repositories/_branches_head.html.haml b/app/views/repositories/_branches_head.html.haml index 63cbee6c4f4..0c94f298270 100644 --- a/app/views/repositories/_branches_head.html.haml +++ b/app/views/repositories/_branches_head.html.haml @@ -1,11 +1,11 @@ = render "commits/head" %ul.nav.nav-pills %li{:class => ("active" if current_page?(project_repository_path(@project)))} - = link_to project_repository_path(@project) do + = link_to project_repository_path(@project) do Recent %li{:class => ("active" if current_page?(project_protected_branches_path(@project)))} - = link_to project_protected_branches_path(@project) do + = link_to project_protected_branches_path(@project) do Protected %li{:class => ("active" if current_page?(branches_project_repository_path(@project)))} - = link_to branches_project_repository_path(@project) do + = link_to branches_project_repository_path(@project) do All diff --git a/app/views/repositories/_feed.html.haml b/app/views/repositories/_feed.html.haml index 9fdba10b926..0734327233e 100644 --- a/app/views/repositories/_feed.html.haml +++ b/app/views/repositories/_feed.html.haml @@ -1,7 +1,7 @@ - commit = update %tr %td - = link_to project_commits_path(@project, :ref => commit.head.name) do + = link_to project_commits_path(@project, :ref => commit.head.name) do %strong = commit.head.name - if commit.head.name == @project.root_ref diff --git a/app/views/repositories/tags.html.haml b/app/views/repositories/tags.html.haml index 884db3b352a..5e5cca31d8f 100644 --- a/app/views/repositories/tags.html.haml +++ b/app/views/repositories/tags.html.haml @@ -26,5 +26,5 @@ - if can? current_user, :download_code, @project = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "visible_link download_repo_link" -- else +- else %h3 No tags diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml index 7ce47eccbeb..b9fff9a77a6 100644 --- a/app/views/search/show.html.haml +++ b/app/views/search/show.html.haml @@ -1,6 +1,6 @@ = form_tag search_path, :method => :get do |f| .padded - = label_tag :search do + = label_tag :search do %strong Looking for .input = text_field_tag :search, params[:search],:placeholder => "issue 143", :class => "input-xxlarge" @@ -13,30 +13,30 @@ - if @projects.empty? && @merge_requests.empty? %h3 %small Nothing here - - else + - else - if @projects.any? %h4 Projects .padded - @projects.each do |project| - = link_to project do + = link_to project do %h4 %span.ico.project = project.name %small - last activity at + last activity at = project.last_activity_date.stamp("Aug 25, 2011") - if @merge_requests.any? %h4 Merge Requests .padded - @merge_requests.each do |merge_request| - = link_to [merge_request.project, merge_request] do + = link_to [merge_request.project, merge_request] do %h5 Merge Request # = merge_request.id – = truncate merge_request.title, :length => 50 %small - updated at + updated at = merge_request.updated_at.stamp("Aug 25, 2011") %strong %span.label= merge_request.project.name @@ -44,14 +44,14 @@ %h4 Issues .padded - @issues.each do |issue| - = link_to [issue.project, issue] do + = link_to [issue.project, issue] do %h5 Issue # = issue.id – = truncate issue.title, :length => 50 %small - updated at + updated at = issue.updated_at.stamp("Aug 25, 2011") %strong %span.label= issue.project.name diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index 5a28a350d3c..c9128f642fc 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -29,8 +29,8 @@ -:javascript - $(function(){ +:javascript + $(function(){ $('select#snippet_expires_at').chosen(); }); diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 762265f16b3..53d6b57f728 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -2,11 +2,11 @@ - if can? current_user, :write_snippet, @project .alert-message.block-message - = link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do + = link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do Add new snippet Share code pastes with others if it cant be in a git repository %br - To add new snippet - click on button. + To add new snippet - click on button. - unless @snippets.fresh.empty? %table.zebra-striped.borders= render @snippets.fresh diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml index 281776de036..1d882e295d9 100644 --- a/app/views/team_members/_form.html.haml +++ b/app/views/team_members/_form.html.haml @@ -22,7 +22,7 @@ = link_to "Cancel", team_project_path(@project), :class => "btn" :css - form select { + form select { width:300px; } diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml index 1213a9816dc..60b3c9bd4d4 100644 --- a/app/views/team_members/_show.html.haml +++ b/app/views/team_members/_show.html.haml @@ -8,9 +8,9 @@ - if user.blocked %span.label Blocked - = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do + = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do = image_tag gravatar_icon(user.email, 40), :class => "avatar" - = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do + = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do %strong= truncate(user.name, :lenght => 40) %br %div.cgray= user.email diff --git a/app/views/team_members/create.js.haml b/app/views/team_members/create.js.haml index bfe8ca0d931..d5ae5d0cc43 100644 --- a/app/views/team_members/create.js.haml +++ b/app/views/team_members/create.js.haml @@ -1,7 +1,7 @@ - if @team_member.valid? :plain $("#new_team_member").hide("slide", { direction: "right" }, 150, function(){ - $("#team-table").show("slide", { direction: "left" }, 150, function() { + $("#team-table").show("slide", { direction: "left" }, 150, function() { $("#new_team_member").remove(); $("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}"); $(".add_new").show(); diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml index c3470cd82f7..f8a203d43c1 100644 --- a/app/views/team_members/show.html.haml +++ b/app/views/team_members/show.html.haml @@ -11,7 +11,7 @@ %hr .back_link %br - = link_to team_project_path(@project), :class => "" do + = link_to team_project_path(@project), :class => "" do ← To team list %br .row @@ -56,7 +56,7 @@ :javascript $(function(){ - $('.repo-access-select, .project-access-select').live("change", function() { + $('.repo-access-select, .project-access-select').live("change", function() { $(this.form).submit(); }); }) diff --git a/app/views/wikis/_form.html.haml b/app/views/wikis/_form.html.haml index 55191250ceb..dbb8648d664 100644 --- a/app/views/wikis/_form.html.haml +++ b/app/views/wikis/_form.html.haml @@ -7,10 +7,10 @@ %li= msg .alert-message.block-message.warning - %p - Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. + %p + Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. %br - To add link to new page you can just type + To add link to new page you can just type %code [Link Title](page-slug) .clearfix = f.label :title |