fixed error with ascii error for dashboard

gitlabhq
1 parent 020e1a8e
Showing 6 changed files with 24 additions and 6 deletions Show diff stats
app/models/issue.rb
app/models/note.rb
app/views/commits/_commits.html.haml
app/views/commits/show.html.haml
app/views/dashboard/index.html.haml
lib/commit_ext.rb
@@ -10,6 +10,11 @@ class Issue &lt; ActiveRecord::Base
   validates_presence_of :assignee_id
   validates_presence_of :author_id
  
+  delegate :name,
+           :email, 
+           :to => :author, 
+           :prefix => true
+
   validates :title,
             :presence => true,
             :length   => { :within => 0..255 }
@@ -7,6 +7,11 @@ class Note &lt; ActiveRecord::Base
   belongs_to :author,
     :class_name => "User"
  
+  delegate :name,
+           :email, 
+           :to => :author, 
+           :prefix => true
+
   attr_protected :author, :author_id
  
   validates_presence_of :project
@@ -11,15 +11,15 @@
                 %i
               %data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
                 Browse Code
-            - if commit.author.email
-              = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
+            - if commit.author_email
+              = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
             - else
               = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
             %span.commit-title
               %strong
                 = truncate(commit.safe_message, :length => 60)
             %span.commit-author
-              %strong= commit.author
+              %strong= commit.author_name
               = time_ago_in_words(commit.committed_date)
               ago
 = more_commits_link if @commits.size > 99
@@ -7,7 +7,7 @@
     %td= @commit.id
   %tr
     %td Author
-    %td= @commit.author
+    %td= @commit.author_name
   %tr
     %td Commiter
     %td= @commit.committer
@@ -25,11 +25,11 @@
         .data
           - project.updates.each do |update|
             %a.project-update{:href => dashboard_feed_path(project, update)}
-              = image_tag gravatar_icon(update.author.email), :class => "left", :width => 40
+              = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
               %span.update-title
                 = dashboard_feed_title(update)
               %span.update-author
-                %strong= update.author.name
+                %strong= update.author_name
                 authored
                 = time_ago_in_words(update.created_at) 
                 ago
@@ -12,4 +12,12 @@ module CommitExt
   def created_at
     committed_date
   end
+
+  def author_email
+    author.email.force_encoding(Encoding::UTF_8)
+  end
+
+  def author_name
+    author.name.force_encoding(Encoding::UTF_8)
+  end
 end
...	...	@@ -10,6 +10,11 @@ class Issue < ActiveRecord::Base
10	10	validates_presence_of :assignee_id
11	11	validates_presence_of :author_id
12	12
	13	+ delegate :name,
	14	+ :email,
	15	+ :to => :author,
	16	+ :prefix => true
	17	+
13	18	validates :title,
14	19	:presence => true,
15	20	:length => { :within => 0..255 }
...	...
...	...	@@ -7,6 +7,11 @@ class Note < ActiveRecord::Base
7	7	belongs_to :author,
8	8	:class_name => "User"
9	9
	10	+ delegate :name,
	11	+ :email,
	12	+ :to => :author,
	13	+ :prefix => true
	14	+
10	15	attr_protected :author, :author_id
11	16
12	17	validates_presence_of :project
...	...
...	...	@@ -11,15 +11,15 @@
11	11	%i
12	12	%data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
13	13	Browse Code
14		- - if commit.author.email
15		- = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
	14	+ - if commit.author_email
	15	+ = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
16	16	- else
17	17	= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
18	18	%span.commit-title
19	19	%strong
20	20	= truncate(commit.safe_message, :length => 60)
21	21	%span.commit-author
22		- %strong= commit.author
	22	+ %strong= commit.author_name
23	23	= time_ago_in_words(commit.committed_date)
24	24	ago
25	25	= more_commits_link if @commits.size > 99
...	...
...	...	@@ -7,7 +7,7 @@
7	7	%td= @commit.id
8	8	%tr
9	9	%td Author
10		- %td= @commit.author
	10	+ %td= @commit.author_name
11	11	%tr
12	12	%td Commiter
13	13	%td= @commit.committer
...	...
...	...	@@ -25,11 +25,11 @@
25	25	.data
26	26	- project.updates.each do \|update\|
27	27	%a.project-update{:href => dashboard_feed_path(project, update)}
28		- = image_tag gravatar_icon(update.author.email), :class => "left", :width => 40
	28	+ = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
29	29	%span.update-title
30	30	= dashboard_feed_title(update)
31	31	%span.update-author
32		- %strong= update.author.name
	32	+ %strong= update.author_name
33	33	authored
34	34	= time_ago_in_words(update.created_at)
35	35	ago
...	...
...	...	@@ -12,4 +12,12 @@ module CommitExt
12	12	def created_at
13	13	committed_date
14	14	end
	15	+
	16	+ def author_email
	17	+ author.email.force_encoding(Encoding::UTF_8)
	18	+ end
	19	+
	20	+ def author_name
	21	+ author.name.force_encoding(Encoding::UTF_8)
	22	+ end
15	23	end
...	...