  module Emails
    module Projects
      def project_access_granted_email(user_project_id)
+diff -urN gitlab-rails.bk/app/models/milestone.rb gitlab-rails/app/models/milestone.rb
+--- gitlab-rails.bk/app/models/milestone.rb	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/models/milestone.rb	2014-03-22 09:00:00.000000000 +0900
+@@ -1,3 +1,4 @@
++# encoding: utf-8
+ # == Schema Information
+ #
+ # Table name: milestones
+@@ -73,9 +74,9 @@
+   def expires_at
+     if due_date
+       if due_date.past?
+-        "expired at #{due_date.stamp("Aug 21, 2011")}"
++        "#{due_date.stamp("2011/08/21")} まで"
+       else
+-        "expires at #{due_date.stamp("Aug 21, 2011")}"
++        "#{due_date.stamp("2011/08/21")} まで"
+       end
+     end
+   end
 diff -urN gitlab-rails.bk/app/models/notification.rb gitlab-rails/app/models/notification.rb
 --- gitlab-rails.bk/app/models/notification.rb	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/models/notification.rb	2014-03-22 09:00:00.000000000 +0900

+      = link_to '課題を解決', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "課題を解決"
 
 .participants
   %cite.cgray #{@issue.participants.count} participants
diff -urN gitlab-rails.bk/app/views/projects/labels/index.html.haml gitlab-rails/app/views/projects/labels/index.html.haml
--- gitlab-rails.bk/app/views/projects/labels/index.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/labels/index.html.haml	2014-03-22 09:00:00.000000000 +0900

diff -urN gitlab-rails.bk/app/views/projects/issues/show.html.haml gitlab-rails/app/views/projects/issues/show.html.haml
--- gitlab-rails.bk/app/views/projects/issues/show.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/issues/show.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,43 +1,43 @@
 %h3.page-title
-  Issue ##{@issue.iid}
+  課題 ##{@issue.iid}
