Skip to content
Snippets Groups Projects
Commit 3bd06d55 authored by Andrey Vakarev's avatar Andrey Vakarev
Browse files

Remove trailing whitespaces and trailing lines

parent 7e0726b1
No related branches found
No related tags found
1 merge request!891Remove trailing whitespaces and trailing lines
Showing
with 65 additions and 77 deletions
Loading
Loading
@@ -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
Loading
Loading
@@ -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"
Loading
Loading
@@ -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"
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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;")
Loading
Loading
%h3
%h3
Projects
= link_to 'New Project', new_admin_project_path, :class => "btn small right"
%br
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@
%b
Name:
%td
= @admin_project.name
= @admin_project.name
%tr
%td
%b
Loading
Loading
@@ -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
Loading
Loading
@@ -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;
}
 
Loading
Loading
@@ -85,9 +85,7 @@
width:300px;
}
 
:javascript
:javascript
$('select#user_ids').chosen();
$('select#repo_access').chosen();
$('select#project_access').chosen();
Loading
Loading
@@ -16,7 +16,7 @@
= link_to 'Cancel', :back, :class => "btn"
 
:css
form select {
form select {
width:300px;
}
 
Loading
Loading
@@ -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
Loading
Loading
@@ -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"
 
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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;
}
 
Loading
Loading
@@ -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?
Loading
Loading
@@ -39,4 +37,3 @@
- else
%p
%center No preview for this file type
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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();
Loading
Loading
Loading
Loading
@@ -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?
Loading
Loading
= 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"
= "..."
Loading
Loading
@@ -31,7 +31,6 @@
%h4 Diff
= render "commits/diffs", :diffs => @diffs
 
:javascript
$(function() {
var availableTags = #{@project.heads.map(&:name).to_json};
Loading
Loading
Loading
Loading
@@ -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(" / ")
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
.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)
Loading
Loading
- 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)
Loading
Loading
%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)
Loading
Loading
@@ -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|
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment