Merge remote-tracking branch 'avakarev/remove-trailing-whitespaces-in-templates'
This commit is contained in:
commit
a0db028c1b
80 changed files with 261 additions and 296 deletions
|
@ -85,9 +85,7 @@
|
||||||
width:300px;
|
width:300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$('select#user_ids').chosen();
|
$('select#user_ids').chosen();
|
||||||
$('select#repo_access').chosen();
|
$('select#repo_access').chosen();
|
||||||
$('select#project_access').chosen();
|
$('select#project_access').chosen();
|
||||||
|
|
||||||
|
|
|
@ -25,4 +25,3 @@
|
||||||
$('select#team_member_project_id').chosen();
|
$('select#team_member_project_id').chosen();
|
||||||
$('select#team_member_repo_access').chosen();
|
$('select#team_member_repo_access').chosen();
|
||||||
$('select#team_member_project_access').chosen();
|
$('select#team_member_project_access').chosen();
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
%td
|
%td
|
||||||
= @admin_user.twitter
|
= @admin_user.twitter
|
||||||
|
|
||||||
|
|
||||||
%br
|
%br
|
||||||
%h3 Add User to Projects
|
%h3 Add User to Projects
|
||||||
%br
|
%br
|
||||||
|
@ -104,9 +103,7 @@
|
||||||
width:300px;
|
width:300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$('select#project_ids').chosen();
|
$('select#project_ids').chosen();
|
||||||
$('select#repo_access').chosen();
|
$('select#repo_access').chosen();
|
||||||
$('select#project_access').chosen();
|
$('select#project_access').chosen();
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,11 @@
|
||||||
But if you still want to see diff
|
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"
|
= link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark"
|
||||||
|
|
||||||
|
|
||||||
%p.cgray
|
%p.cgray
|
||||||
Showing #{pluralize(diffs.count, "changed file")}
|
Showing #{pluralize(diffs.count, "changed file")}
|
||||||
.file_stats
|
.file_stats
|
||||||
= render "commits/diff_head", :diffs => diffs
|
= render "commits/diff_head", :diffs => diffs
|
||||||
|
|
||||||
|
|
||||||
- unless @suppress_diff
|
- unless @suppress_diff
|
||||||
- diffs.each_with_index do |diff, i|
|
- diffs.each_with_index do |diff, i|
|
||||||
- next if diff.diff.empty?
|
- next if diff.diff.empty?
|
||||||
|
@ -39,4 +37,3 @@
|
||||||
- else
|
- else
|
||||||
%p
|
%p
|
||||||
%center No preview for this file type
|
%center No preview for this file type
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
= 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"
|
= image_tag "rss_ui.png", :title => "feed"
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(function(){
|
$(function(){
|
||||||
$('.project-refs-select').chosen();
|
$('.project-refs-select').chosen();
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
%h4 Diff
|
%h4 Diff
|
||||||
= render "commits/diffs", :diffs => @diffs
|
= render "commits/diffs", :diffs => @diffs
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(function() {
|
$(function() {
|
||||||
var availableTags = #{@project.heads.map(&:name).to_json};
|
var availableTags = #{@project.heads.map(&:name).to_json};
|
||||||
|
|
|
@ -27,4 +27,3 @@
|
||||||
- else
|
- else
|
||||||
- event.commits.each do |commit|
|
- event.commits.each do |commit|
|
||||||
= render "events/commit", :commit => commit, :project => project
|
= render "events/commit", :commit => commit, :project => project
|
||||||
|
|
||||||
|
|
|
@ -40,4 +40,3 @@
|
||||||
%td POST
|
%td POST
|
||||||
%td
|
%td
|
||||||
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
|
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,6 @@
|
||||||
= f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
|
= f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
|
||||||
%p.hint Markdown is enabled.
|
%p.hint Markdown is enabled.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
- if @issue.new_record?
|
- if @issue.new_record?
|
||||||
= f.submit 'Submit new issue', :class => "primary btn"
|
= f.submit 'Submit new issue', :class => "primary btn"
|
||||||
|
|
|
@ -22,11 +22,5 @@
|
||||||
- if issue.upvotes > 0
|
- if issue.upvotes > 0
|
||||||
%span.label.success= "+#{issue.upvotes}"
|
%span.label.success= "+#{issue.upvotes}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
= link_to project_issue_path(issue.project, issue) do
|
= link_to project_issue_path(issue.project, issue) do
|
||||||
%p.row_title= truncate(issue.title, :length => 100)
|
%p.row_title= truncate(issue.title, :length => 100)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,5 +12,3 @@
|
||||||
%pre= @key.key
|
%pre= @key.key
|
||||||
.actions
|
.actions
|
||||||
= link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key"
|
= link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -43,4 +43,3 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -83,9 +83,6 @@
|
||||||
.alert.alert-info
|
.alert.alert-info
|
||||||
%strong This merge request already can not be merged. Try to reload page.
|
%strong This merge request already can not be merged. Try to reload page.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
= render "merge_requests/commits"
|
= render "merge_requests/commits"
|
||||||
|
|
||||||
- unless @commits.empty?
|
- unless @commits.empty?
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
.controls
|
.controls
|
||||||
.datepicker
|
.datepicker
|
||||||
|
|
||||||
|
|
||||||
.form-actions
|
.form-actions
|
||||||
- if @milestone.new_record?
|
- if @milestone.new_record?
|
||||||
= f.submit 'Create milestone', :class => "primary btn"
|
= f.submit 'Create milestone', :class => "primary btn"
|
||||||
|
|
|
@ -65,6 +65,5 @@
|
||||||
|
|
||||||
= link_to "Add Public Key", new_key_path, :class => "btn small right"
|
= link_to "Add Public Key", new_key_path, :class => "btn small right"
|
||||||
|
|
||||||
|
|
||||||
.form-actions
|
.form-actions
|
||||||
= f.submit 'Save', :class => "btn-primary btn"
|
= f.submit 'Save', :class => "btn-primary btn"
|
||||||
|
|
|
@ -27,4 +27,3 @@
|
||||||
= 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
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
= f.submit 'Protect', :class => "primary btn"
|
= f.submit 'Protect', :class => "primary btn"
|
||||||
|
|
||||||
|
|
||||||
- unless @branches.empty?
|
- unless @branches.empty?
|
||||||
%table.admin-table
|
%table.admin-table
|
||||||
%thead
|
%thead
|
||||||
|
@ -48,9 +47,5 @@
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
|
= link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$('select#protected_branch_name').chosen();
|
$('select#protected_branch_name').chosen();
|
||||||
|
|
Loading…
Add table
Reference in a new issue