Commit 3bd06d55 authored by Andrey Vakarev's avatar Andrey Vakarev

Remove trailing whitespaces and trailing lines

parent 7e0726b1
......@@ -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"
......
......@@ -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;")
......
%h3
%h3
Projects
= link_to 'New Project', new_admin_project_path, :class => "btn small right"
%br
......
......@@ -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();
......@@ -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();
%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"
......
......@@ -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();
- 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
......@@ -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();
......
......@@ -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?
......
= 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};
......
......@@ -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(" / ")
......
......@@ -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;
});
});
= 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
......
.alert-message.block-message.error
%h3 Encoding Error
%hr
%p
%p
Page cant be loaded cause of encoding error
.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
- 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
= 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)
......
- 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)
......
%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
%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
......
%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"
......@@ -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
......@@ -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"
......@@ -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"
%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"
......@@ -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)
= render "form"
:javascript
$(function(){
:javascript
$(function(){
$('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen();
});
......
......@@ -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
......
= render "form"
:javascript
$(function(){
:javascript
$(function(){
$('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen();
});
......
%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