Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
xiphon
CCS Backend
Commits
52f534f8
Commit
52f534f8
authored
May 28, 2019
by
xiphon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proposals: allow overriding 'gitlab_url' for fr/wp/cp projects
parent
f7edbff4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/Console/Commands/ProcessProposals.php
app/Console/Commands/ProcessProposals.php
+6
-2
No files found.
app/Console/Commands/ProcessProposals.php
View file @
52f534f8
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment