clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
This commit is contained in:
parent
f6a67fbad5
commit
d62200cad4
112 changed files with 1408 additions and 1437 deletions
|
@ -23,9 +23,9 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def last_commit(project)
|
||||
if project.repo_exists?
|
||||
if project.repo_exists?
|
||||
time_ago_in_words(project.commit.committed_date) + " ago"
|
||||
else
|
||||
else
|
||||
"Never"
|
||||
end
|
||||
end
|
||||
|
@ -33,8 +33,8 @@ module ApplicationHelper
|
|||
def search_autocomplete_source
|
||||
projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
|
||||
default_nav = [
|
||||
{ :label => "Keys", :url => keys_path },
|
||||
{ :label => "Projects", :url => projects_path },
|
||||
{ :label => "Keys", :url => keys_path },
|
||||
{ :label => "Projects", :url => projects_path },
|
||||
{ :label => "Admin", :url => admin_root_path }
|
||||
]
|
||||
|
||||
|
@ -42,10 +42,10 @@ module ApplicationHelper
|
|||
|
||||
if @project && !@project.new_record?
|
||||
project_nav = [
|
||||
{ :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
|
||||
{ :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
|
||||
{ :label => "#{@project.code} / Tree", :url => tree_project_path(@project) },
|
||||
{ :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
|
||||
{ :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
|
||||
{ :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
|
||||
{ :label => "#{@project.code} / Tree", :url => tree_project_path(@project) },
|
||||
{ :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
|
||||
{ :label => "#{@project.code} / Team", :url => team_project_path(@project) }
|
||||
]
|
||||
end
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
module CommitsHelper
|
||||
def diff_line(line, line_new = 0, line_old = 0)
|
||||
full_line = html_escape(line.gsub(/\n/, ''))
|
||||
color = if line[0] == "+"
|
||||
color = if line[0] == "+"
|
||||
full_line = "<span class=\"old_line\"> </span><span class=\"new_line\">#{line_new}</span> " + full_line
|
||||
"#DFD"
|
||||
elsif line[0] == "-"
|
||||
elsif line[0] == "-"
|
||||
full_line = "<span class=\"old_line\">#{line_old}</span><span class=\"new_line\"> </span> " + full_line
|
||||
"#FDD"
|
||||
else
|
||||
else
|
||||
full_line = "<span class=\"old_line\">#{line_old}</span><span class=\"new_line\">#{line_new}</span> " + full_line
|
||||
"none"
|
||||
end
|
||||
|
|
|
@ -12,7 +12,7 @@ module ProjectsHelper
|
|||
else
|
||||
true
|
||||
end
|
||||
rescue
|
||||
rescue
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue