From 23d5d57f5caff5cb5a2c33c203208bd10efdf45d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 8 Oct 2016 10:49:50 +0800
Subject: [PATCH] =?UTF-8?q?admin=E2=80=9C=E9=9A=90=E8=97=8F=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E2=80=9D=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                    |  4 ++--
 app/views/layouts/_logined_header.html.erb | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1305320cf..cbeade2a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- # gem "test-unit", "~>3.0"
+ gem "test-unit", "~>3.0"
 
 ### profile
- # gem 'oneapm_rpm'
+ gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 98c06aafb..378741035 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -14,13 +14,14 @@
           <li class="navHomepageMenu fl">
             <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
           </li>
-          <!--<li class="navHomepageMenu fl mr30">-->
-            <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
-          <!--</li>-->
-      <% end %>
-          <li class="navHomepageMenu fl mr40">
-            <a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
+          <li class="navHomepageMenu fl mr30">
+            <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
           </li>
+      <% else %>
+          <li class="navHomepageMenu fl mr40">
+            <a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="c_white f16 db p10" >公共贴吧</a>
+          </li>
+      <% end %>
     </ul>
   </div>
   <script>