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 73 additions and 85 deletions
%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
 
Loading
Loading
%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"
 
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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|
Loading
Loading
@@ -30,7 +30,7 @@
%tr
%th URL
%th Method
%th
%th
- @hooks.each do |hook|
%tr
%td
Loading
Loading
@@ -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"
Loading
Loading
@@ -24,7 +24,7 @@
.clearfix
= f.label :critical, "Critical"
.input= f.check_box :critical
- unless @issue.new_record?
.clearfix
= f.label :closed
Loading
Loading
@@ -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"
Loading
Loading
@@ -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"
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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();
});
Loading
Loading
Loading
Loading
@@ -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' }
Loading
Loading
@@ -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
Loading
Loading
= render "form"
 
:javascript
$(function(){
:javascript
$(function(){
$('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen();
});
Loading
Loading
%h3
Issue ##{@issue.id}
%small
created at
created at
= @issue.created_at.stamp("Aug 21, 2011")
 
%span.right
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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
Loading
Loading
@@ -28,7 +28,7 @@
%h4
- if @issue.closed
.alert-message.error.status_info Closed
- else
- else
.alert-message.success.status_info Open
= @issue.title
 
Loading
Loading
@@ -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
Loading
Loading
%h3
%h3
SSH Keys
= link_to "Add new", new_key_path, :class => "btn small right"
%br
 
%table#keys-table.admin-table
Loading
Loading
%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"
%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"}"
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
@@ -43,4 +43,3 @@
}
});
});
Loading
Loading
@@ -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
Loading
Loading
@@ -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
- 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
= render "commits/diffs", :diffs => @diffs
- if @diffs.empty?
- if @diffs.empty?
%p.cgray Nothing to merge
Loading
Loading
@@ -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
 
 
Loading
Loading
@@ -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() });
});
});
Loading
Loading
.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
 
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