diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index efa060434..2d77c21d4 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -75,10 +75,13 @@ class PullRequestsController < ApplicationController
   # @param  [Integer] id The ID of a merge request.
   # @return [Gitlab::ObjectifiedHash]
   def accept_pull_request
-    commit_id = parmas[:commit_id]
-    status = @g.accept_merge_rquest(@project.gpid, commit_id)
-    if status == '200'
-      # 需跳入的地方
+    begin
+      status = @g.accept_merge_rquest(@project.gpid, params[:id])
+      respond_to do |format|
+        format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
+      end
+    rescue Exception => e
+      @message = e.message
     end
   end
 
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index 0ba02d9b4..4aac6193c 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -1,45 +1,52 @@
-<div id="mergeShow" class="f14 fontGrey2 merge-show">
-  <span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
-  <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
-  <div class="cl"></div>
+<div id="create_pull_request_error">
+  <%= render :partial => "pull_requests/error_message" %>
 </div>
-<div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
-<% if @commits_count == 0 && @changes_count == 0 %>
-    <div class="mt10 mb15">
-      请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
-      <div class="merge-commit-option mt15">
-        <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl"><%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %></span><br />
-        <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
+
+<div id="pull_request_show">
+  <div id="mergeShow" class="f14 fontGrey2 merge-show">
+    <span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
+    <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
+    <div class="cl"></div>
+  </div>
+  <div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
+  <% if @commits_count == 0 && @changes_count == 0 %>
+      <div class="mt10 mb15">
+        请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+        <div class="merge-commit-option mt15">
+          <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl"><%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %></span><br />
+          <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
+        </div>
       </div>
-    </div>
-<% else %>
-    <% if @request.state == "merged" %>
+  <% else %>
+      <% if @request.state == "merged" %>
 
 
-        6666
-    <% else %>
-        <div class="mt10 mb15">
-          请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
-          <div class="merge-commit-option mt15">
-            <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
+          6666
+      <% else %>
+          <div class="mt10 mb15">
+            请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+            <div class="merge-commit-option mt15">
+              <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "BlueCirBtn" %>
+            </div>
           </div>
-        </div>
-    <% end %>
-    <ul class="merge-record" style="border-top:1px solid #ddd;">
-      <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
-      <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
-    </ul>
-    <div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
-    <div id="merge_record_0">
-      <%= render :partial => "pull_requests/pull_request_commits" %>
-    </div>
-    <div id="merge_record_1" class="undis">
-      <%= render :partial => "pull_requests/pull_request_changes" %>
-    </div>
-<% end %>
+      <% end %>
+      <ul class="merge-record" style="border-top:1px solid #ddd;">
+        <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
+        <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
+      </ul>
+      <div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
+      <div id="merge_record_0">
+        <%= render :partial => "pull_requests/pull_request_commits" %>
+      </div>
+      <div id="merge_record_1" class="undis">
+        <%= render :partial => "pull_requests/pull_request_changes" %>
+      </div>
+  <% end %>
+</div>
+
 
 <script>
-    $("#mergeShow").parent().css("width","730px");
+    $("#pull_request_show").parent().css("width","730px");
 
     $("#changed-files").toggle(function(){
         $("#changed-files-detail").show();
diff --git a/app/views/pull_requests/accept_pull_request.js.erb b/app/views/pull_requests/accept_pull_request.js.erb
new file mode 100644
index 000000000..b9007d7a3
--- /dev/null
+++ b/app/views/pull_requests/accept_pull_request.js.erb
@@ -0,0 +1,2 @@
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
+
diff --git a/app/views/pull_requests/show.js.erb b/app/views/pull_requests/show.js.erb
index af5935536..0a64c51a8 100644
--- a/app/views/pull_requests/show.js.erb
+++ b/app/views/pull_requests/show.js.erb
@@ -1 +1,3 @@
-$("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
\ No newline at end of file
+<%# 详情页面和新建页面都会跳入，所以用两种局部刷新 %>
+$("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
+$("#pull_request_show").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 4c40a6fb7..f68745fd8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -809,7 +809,7 @@ RedmineApp::Application.routes.draw do
       collection do
       end
       member do
-        post 'accept_pull_request'
+        get 'accept_pull_request'
         get 'pull_request_commits'
         get 'pull_request_changes'
       end