From d783d998fc01758f01ece6a5193db17c84b2673d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 8 May 2021 14:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82-url=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js             | 2 +-
 src/forge/Merge/MergeItem.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index bd24bb7d..034612ec 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -58,7 +58,7 @@ export function initAxiosInterceptors(props) {
     },
     err => {
       return Promise.reject(err);
-    });
+  });
 
   axios.interceptors.response.use(function (response) {
     if (response === undefined) {
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 3b3504da..0873f5da 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -178,7 +178,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/merge/${item.pull_request_id}/updatemerge`}
+                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>