update paths

Author: Leon

GitLab.php

@@ -57,8 +57,6 @@ public function upload_files() {
             echo 'ERROR';
             die(); }
 
-        $this->initiateProgressIndicator();
-
         $batch_size = $this->settings['deployBatchSize'];
 
         if ( $batch_size > $this->files_remaining ) {
@@ -133,11 +131,6 @@ public function upload_files() {
                 $target_path,
                 $local_file_contents
             );
-
-            // NOTE: delay and progress askew in GitLab as we may
-            // upload all in one  request. Progress indicates building
-            // of list of files that will be deployed/checking if different
-            $this->updateProgress();
         }
 
         $this->pauseBetweenAPICalls();

includes/class-wp2static-addon-gitlab.php

@@ -48,10 +48,10 @@ public function load_deployment_option_template( $templates ) {
     public function add_deployment_option_keys( $keys ) {
         $new_keys = array(
             'baseUrl-gitlab',
-            'ghBranch',
-            'ghPath',
-            'ghToken',
-            'ghRepo',
+            'glBranch',
+            'glPath',
+            'glProject',
+            'glToken',
         );
 
         $keys = array_merge(
@@ -65,9 +65,9 @@ public function add_deployment_option_keys( $keys ) {
     public function whitelist_deployment_option_keys( $keys ) {
         $whitelist_keys = array(
             'baseUrl-gitlab',
-            'ghBranch',
-            'ghPath',
-            'ghRepo',
+            'glBranch',
+            'glPath',
+            'glProject',
         );
 
         $keys = array_merge(
@@ -81,10 +81,10 @@ public function whitelist_deployment_option_keys( $keys ) {
     public function add_post_and_db_keys( $keys ) {
         $keys['gitlab'] = array(
             'baseUrl-gitlab',
-            'ghBranch',
-            'ghPath',
-            'ghToken',
-            'ghRepo',
+            'glBranch',
+            'glPath',
+            'glProject',
+            'glToken',
         );
 
         return $keys;