Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

Conflicts:
	app/controllers/pull_requests_controller.rb

app/controllers/pull_requests_controller.rb

@@ -102,15 +102,15 @@ class PullRequestsController < ApplicationController
           @fork_project_name = Project.find(params[:target_project_id]).try(:name)
           @fork_pr_message = true if @fork_project_name
           # 发送消息
-          send_message(User.current.id, target_project_id, title)
+          #send_message(User.current.id, target_project_id, title)
           # 创建Trustie数据
-          PullRequest.create(:pull_request_id => request.id, :user_id => User.current.id, :status => 1, :project_id => target_project_id)
+          #PullRequest.create(:pull_request_id => request.id, :user_id => User.current.id, :status => 1, :project_id => target_project_id)
         else
           request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
           # 发送消息
-          send_message(User.current.id, @project.id, title)
+          #send_message(User.current.id, @project.id, title)
           # 创建Trustie数据
-          PullRequest.create(:pull_request_id => request.id, :user_id => User.current.id, :status => 1, :project_id => @project.id)
+          #PullRequest.create(:pull_request_id => request.id, :user_id => User.current.id, :status => 1, :project_id => @project.id)
           respond_to do |format|
             format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
           end

app/helpers/application_helper.rb

@@ -75,7 +75,7 @@ module ApplicationHelper
   # 通过系统外部用户名查找用户，如果用户不存在则用邮箱替换
   def get_user_by_login_and login
     user = User.find_by_login(login)
-    user.nil? ? User.find(2) : user
+    (user.nil? || login == "root") ? User.find(2) : user
   end
 
   # 重置user_path，目的是将id转换成用户名

app/views/pull_requests/_pull_requests_list.html.erb

@@ -12,7 +12,7 @@
             <%= link_to "", project_pull_request_path(request.id, :project_id => @project.id), :class => "issues_icons_mes fr mr5 ml5" %>
           </div>
           <div class="c_grey clear mt5">
-            <p class="fl">由 <%= link_to User.find(request.author.id).try(:show_name), user_path(get_user_by_login_and(request.author.try(:username))), :class => "linkBlue2" %> 创建于<%= time_tag(request.created_at) %>前</p>
+            <p class="fl">由 <%= link_to get_user_by_login_and(request.author.try(:username)).try(:show_name), user_path(get_user_by_login_and(request.author.try(:username))), :class => "linkBlue2" %> 创建于<%= time_tag(request.created_at) %>前</p>
             <span class="fl ml10"><%= time_tag(request.updated_at) %>前更新</span>
             <p class="fr"><%= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
           </div>

app/views/users/_user_message_forge.html.erb

@@ -195,7 +195,7 @@
         </ul>
     <% end %>
 <!--
-    <% if ma.forge_message_type == "PullRequest" %>
+    <%# if ma.forge_message_type == "PullRequest" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);">
@@ -213,5 +213,5 @@
           </li>
           <li class="homepageNewsTime fl"><%#= time_tag(ma.created_at).html_safe %> </li>
         </ul>
-    <% end %>-->
+    <%# end %>-->
 <% end %>