From 3c9279d285f26e346debf34d7036ae67361053ab Mon Sep 17 00:00:00 2001
From: ganyiang <ganyiang@gmail.com>
Date: Fri, 30 May 2014 08:29:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/open_source_projects/_show_topics.html.erb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index ac7c5b4db..f207cc552 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -55,7 +55,7 @@
 <img src="/images/version_marker.png" alt="Tags">
 </span>
 <span class="tag_fouse">聚焦:</span>
-<div id="tag">Heartblood</div>
+<div id="tag">Heartbleed</div>
 <div id="tag">致命漏洞</div>
 </div>
 
@@ -70,10 +70,7 @@
 <div id="tag">信息泄露</div>
 </div>
 
-<%end if %>
-
-
-
+<%end%>
 
         <div class="fixed"></div>
         <div class="li_list" style="margin-top:10px;margin-left:10px">

From 325bb85cc5a427eb9805c4fce67a68a9b18d7f82 Mon Sep 17 00:00:00 2001
From: xianbo <senluowanxiangt@163.com>
Date: Fri, 30 May 2014 09:28:13 +0800
Subject: [PATCH 2/2] fix linchun

---
 lib/redmine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 944dd473b..93f225612 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -287,7 +287,7 @@ Redmine::MenuManager.map :contest_menu do |menu|
   #menu.push :project, :show_project_contest_path, :caption => :label_contest_project
   #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
   menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest
-  menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
+  # menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
   # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest
   # menu.push :result,  { :controller => 'bids', :action => 'show_results' }, 
              # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p }