Merge branch 'allow-overriding-gitlab_url' into 'master'

proposals: allow overriding 'gitlab_url' for fr/wp/cp projects

See merge request monero-project/ccs-back!11

app/Console/Commands/ProcessProposals.php

@@ -52,7 +52,7 @@ class ProcessProposals extends Command
             }
             if (basename($filename) != $filename) {
                 continue;
-            }            
+            }
             $result[$filename] = $request->web_url;
         }
 
@@ -109,7 +109,7 @@ class ProcessProposals extends Command
                     }
                     if (!isset($mergedMrFilenameToUrlMap[$filename])) {
                         $this->error("Project $filename: failed to find matching merged MR");
-                        $gitlab_url = null; 
+                        $gitlab_url = null;
                     } else {
                         $gitlab_url = htmlspecialchars($mergedMrFilenameToUrlMap[$filename], ENT_QUOTES);
                     }
@@ -123,6 +123,10 @@ class ProcessProposals extends Command
                     $this->info("Updating project $filename");
                 }
 
+                if (isset($detail['values']['gitlab_url'])) {
+                    $project->gitlab_url = htmlspecialchars($detail['values']['gitlab_url'], ENT_QUOTES);
+                }
+
                 $project->author = $author;
                 $project->state = $state;
                 $project->target_amount = $amount;