Permalink
Browse files

Merge branch 'master' of github.com:cibernox/pinkmine

Conflicts:
	app/helpers/application_helper.rb
	app/helpers/issues_helper.rb
	app/views/projects/show.html.haml
	spec/helpers/issues_helper_spec.rb
  • Loading branch information...
2 parents 91f5ef6 + 44b32e9 commit e144119988b20508e8afc1c4693750df6bd7a6a4 miguel.camba committed May 10, 2012
Showing with 1 addition and 2 deletions.
  1. +0 −1 app/helpers/issues_helper.rb
  2. +1 −1 app/views/projects/show.html.haml
View
1 app/helpers/issues_helper.rb
@@ -34,7 +34,6 @@ def issue_priority_label(issue)
content_tag(:span, issue.priority, class: "label #{color_class}")
end
-
# Generates a dropdown button for select the status of the given issue
def issue_status_dropdown(issue)
link_content = issue.status + content_tag(:span, nil, class: 'caret')
View
2 app/views/projects/show.html.haml
@@ -31,4 +31,4 @@
%td= link_to issue.title, [project, issue]
%td= truncate(issue.description, length: 50)
%td= link_to issue.responsable, issue.responsable if issue.responsable
- %td= issue_progress_bar(issue)
+ %td= issue_progress_bar(issue)

0 comments on commit e144119

Please sign in to comment.