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 54 additions and 59 deletions
Loading
Loading
@@ -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'})
Loading
Loading
@@ -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'",
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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|
Loading
Loading
@@ -34,7 +34,7 @@
→
.bottom= paginate @projects, :theme => "gitlab"
 
- else
- else
%h3 Nothing here
%br
- if current_user.can_create_project?
Loading
Loading
@@ -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
Loading
Loading
@@ -4,7 +4,7 @@
.row
-#.span2
.back_link
= link_to projects_path do
= link_to projects_path do
← To projects list
.span7
.form-horizontal
Loading
Loading
@@ -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?
Loading
Loading
= 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}
Loading
Loading
= 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
Loading
Loading
@@ -23,7 +23,6 @@
 
= f.submit 'Protect', :class => "primary btn"
 
- unless @branches.empty?
%table.admin-table
%thead
Loading
Loading
@@ -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();
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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"
Loading
Loading
Loading
Loading
@@ -2,6 +2,6 @@
#tree-holder= render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}
 
:javascript
$(function() {
$(function() {
Tree.init();
});
= 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
- 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
Loading
Loading
Loading
Loading
@@ -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
= 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"
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -29,8 +29,8 @@
 
 
 
:javascript
$(function(){
:javascript
$(function(){
$('select#snippet_expires_at').chosen();
});
 
Loading
Loading
@@ -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
Loading
Loading
@@ -22,7 +22,7 @@
= link_to "Cancel", team_project_path(@project), :class => "btn"
 
:css
form select {
form select {
width:300px;
}
 
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
- 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();
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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();
});
})
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
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