Merge branch 'liyuchun_api' into 'master'

Remove unused code.

See merge request easycorp/zentaopms!3988

module/group/lang/resource.php

@@ -1404,7 +1404,6 @@ $lang->sonarqube->methodOrder[50] = 'browseIssue';
 /* merge request. */
 $lang->resource->mr = new stdclass();
 $lang->resource->mr->create    = 'create';
-$lang->resource->mr->apiCreate = 'apiCreate';
 $lang->resource->mr->browse    = 'browse';
 $lang->resource->mr->edit      = 'edit';
 $lang->resource->mr->delete    = 'delete';

module/mr/control.php

@@ -99,30 +99,6 @@ class mr extends control
         $this->display();
     }
 
-    /**
-     * Create MR function by api.
-     *
-     * @access public
-     * @return void
-     */
-    public function apiCreate()
-    {
-        if($_POST)
-        {
-            $this->mr->apiCreate();
-
-            $response['result']  = 'success';
-            $response['message'] = $this->lang->saveSuccess;
-            if(dao::isError())
-            {
-                $response['result']  = 'fail';
-                $response['message'] = join("\n", dao::getError());
-            }
-
-            return $this->send($response);
-        }
-    }
-
     /**
      * Edit MR function.
      *

module/mr/model.php

@@ -301,11 +301,9 @@ class mrModel extends model
         /* Exec Job */
         if($MR->hasNoConflict == '0' && $MR->mergeStatus == 'can_be_merged' && $MR->jobID)
         {
-            $extraParam = array();
-            if(!empty($repo->fileServerUrl)) $extraParam = array('ZENTAO_REPOPATH' => $repo->fileServerUrl);
-
-            $pipeline = $this->loadModel('job')->exec($MR->jobID, $extraParam);
-            $newMR    = new stdClass();
+            $extraParam = array('sourceBranch' => $MR->sourceBranch, 'targetBranch' => $MR->targetBranch);
+            $pipeline   = $this->loadModel('job')->exec($MR->jobID, $extraParam);
+            $newMR      = new stdClass();
             if(!empty($pipeline->queue))
             {
                 $compile = $this->loadModel('compile')->getByQueue($pipeline->queue);