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 69 additions and 75 deletions
%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
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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
Loading
Loading
@@ -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)
 
Loading
Loading
@@ -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)
Loading
Loading
@@ -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
Loading
Loading
@@ -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;
});
});
%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
Loading
Loading
@@ -30,7 +30,6 @@
.controls
.datepicker
 
.form-actions
- if @milestone.new_record?
= f.submit 'Create milestone', :class => "primary btn"
Loading
Loading
@@ -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
Loading
Loading
= render "form"
 
:javascript
$(function(){
:javascript
$(function(){
$('select#issue_assignee_id').chosen();
});
 
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
@@ -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}
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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]}, "");
Loading
Loading
@@ -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();
Loading
Loading
%tr.line_notes_row
%td{:colspan => 3}
%td{:colspan => 3}
%ul
= render :partial => "notes/show", :locals => {:note => note}
 
%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"
- if @note.line_code
= render "create_line", :note => @note
- else
- else
= render "create_common", :note => @note
 
-# Enable submit button
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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();
});
Loading
Loading
Loading
Loading
@@ -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}%;"}
Loading
Loading
@@ -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"
%h3
%h3
Private token
%span.cred.right
keep it in secret!
Loading
Loading
Loading
Loading
@@ -14,7 +14,7 @@
.alert.alert-info
%h5 Advanced settings:
.clearfix
= f.label :path do
= f.label :path do
Git Clone
.input
.input-prepend
Loading
Loading
@@ -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:
 
Loading
Loading
@@ -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"
Loading
Loading
Loading
Loading
@@ -13,7 +13,7 @@
.alert.alert-info
%h5 Advanced settings:
.clearfix
= f.label :path do
= f.label :path do
Git Clone
.input
.input-prepend
Loading
Loading
@@ -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
Loading
Loading
%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
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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();
});
})
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