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
cibernox · May 10, 2012 · e144119 · e144119
2 parents 91f5ef6 + 44b32e9
commit e144119
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/helpers/issues_helper.rb b/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')

diff --git a/app/views/projects/show.html.haml b/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)