diff --git a/module/job/model.php b/module/job/model.php index 135c99af3c..97760e98fc 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -305,7 +305,7 @@ class jobModel extends model ->add('editedDate', helper::now()) ->remove('repoType,reference') ->get(); - $repo = $this->loadModel('repo')->getByID($job->gitlabRepo); + $repo = $this->loadModel('repo')->getByID($job->repo); if($job->engine == 'jenkins') { @@ -326,7 +326,6 @@ class jobModel extends model } } - $job->repo = $job->gitlabRepo; $job->server = (int)zget($repo, 'serviceHost', 0); $job->pipeline = json_encode(array('project' => $project, 'reference' => '')); } diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index 3844cf28a0..a7c7035e02 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -144,7 +144,7 @@ panel set::onClickItem(jsRaw('window.treeClick')), ) ), - a(set::className('iframe'), setData('size', '1000px'), setData('toggle', 'modal'), set::id('linkObject')) + a(set::className('iframe'), setData('size', '1200px'), setData('toggle', 'modal'), set::id('linkObject')) ) ); diff --git a/module/repo/ui/diffeditor.html.php b/module/repo/ui/diffeditor.html.php index 2d1dcf7653..9f34c58059 100644 --- a/module/repo/ui/diffeditor.html.php +++ b/module/repo/ui/diffeditor.html.php @@ -92,4 +92,4 @@ sidebar ) ); -a(set::className('iframe'), setData('size', '1000px'), setData('toggle', 'modal'), set::id('linkObject')); +a(set::className('iframe'), setData('size', '1200px'), setData('toggle', 'modal'), set::id('linkObject')); diff --git a/module/repo/ui/monaco.html.php b/module/repo/ui/monaco.html.php index 79237c45e0..3f9f8966c6 100644 --- a/module/repo/ui/monaco.html.php +++ b/module/repo/ui/monaco.html.php @@ -113,4 +113,4 @@ sidebar ) ); -a(set::className('iframe'), setData('size', 'lg'), setData('toggle', 'modal'), set::id('linkObject')); +a(set::className('iframe'), setData('size', '1200px'), setData('toggle', 'modal'), set::id('linkObject'));