Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Ansgar Burchardt writes ("Re: Want to make salsa advertise contact and source
code details [and 1 more messages]"):
> That seems like an horrible maintenance nightmare just to avoid even
> talking to upstream...
OK, so does someone in Debian, maybe from the Salsa team, have any
contacts I could use ? (I promise to be reasonable and polite.)
Or should I just try to go in through the "front door" and create an
issue in Gitlab CE's gitlab ?
ISTM that the former approach is more likely to work if we know anyone
at Gitlab already.
Thanks,
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
On Fri, 2018-05-25 at 18:57 +0100, Ian Jackson wrote: > Another way to achieve the effect I want would be to do it post-hoc in > a reverse proxy. I see that salsa is using Apache as a reverse proxy. > So perhaps the right answer is to do this in Apache. It seems quite > hacky, but if it's thought easier to maintain then fine... That seems like an horrible maintenance nightmare just to avoid even talking to upstream... Ansgar
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Ian Jackson writes ("Re: Want to make salsa advertise contact and source code
details [and 1 more messages]"):
> Oh, quite possibly. I don't know anything about gitlab's plugin
> system.
... I don't think so, in fact. I found this documentation:
https://docs.gitlab.com/ce/administration/plugins.html
and it suggests that plugins are a way to run code in response to
things being done in gitlab, not a way to modify gitlab's html output.
Another way to achieve the effect I want would be to do it post-hoc in
a reverse proxy. I see that salsa is using Apache as a reverse proxy.
So perhaps the right answer is to do this in Apache. It seems quite
hacky, but if it's thought easier to maintain then fine...
Ian.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Jonathan Carter writes ("Re: Want to make salsa advertise contact and source
code details [and 1 more messages]"):
> On 25/05/2018 19:16, Ian Jackson wrote:
> > Can you please tell me what you think the appropriate path or venue is
> > for me to pursue this diagreement ?
>
> I notice GitLab has a plugin system, would it be possible to affect that
> change in a plugin? That way it's at least not a patch to upstream code,
> and perhaps it might be easier to convince salsa maintainers to use that.
Oh, quite possibly. I don't know anything about gitlab's plugin
system.
Ian.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
On Fri, 25 May 2018, Ian Jackson wrote:
> Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
> code details [and 1 more messages]"):
> > It was a decision by the team to disallow any patch that is not
> > really really needed for function. Please submit your patch
> > upstream.
>
> I see. I'm afraid I strongly disagree with this decision, for
> practical reasons, and because of its rationale. In any case, IMO
> this patch is required for the important function of giving Salsa
> users access to the appropriate contact channels and source code
> reference.
I think that they should use the official docs - or the help button.
> I am sure that my patch would be rejected by upstream. As I have it,
> it is not suitable for upstream because it hardcodes the Debian
> information. I obviouslyu do not want to spend the time to redevelop
> the configurable version (like the proprietary version of gitlab has)
> when you have said you will rejected it, and it would also almost
> certainly be rejected by upstream.
Did you asked them?
> Can you please tell me what you think the appropriate path or venue is
> for me to pursue this diagreement ?
Get in contact with upstream and ask them about including the feature in CE.
Alex
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
*rings chimes* On 25/05/2018 19:16, Ian Jackson wrote: > Can you please tell me what you think the appropriate path or venue is > for me to pursue this diagreement ? I notice GitLab has a plugin system, would it be possible to affect that change in a plugin? That way it's at least not a patch to upstream code, and perhaps it might be easier to convince salsa maintainers to use that. -Jonathan -- ⢀⣴⠾⠻⢶⣦⠀ Jonathan Carter (highvoltage) ⣾⠁⢠⠒⠀⣿⡁ Debian Developer - https://wiki.debian.org/highvoltage ⢿⡄⠘⠷⠚⠋ https://debian.org | https://jonathancarter.org ⠈⠳⣄ Be Bold. Be brave. Debian has got your back.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
code details [and 1 more messages]"):
> It was a decision by the team to disallow any patch that is not
> really really needed for function. Please submit your patch
> upstream.
I see. I'm afraid I strongly disagree with this decision, for
practical reasons, and because of its rationale. In any case, IMO
this patch is required for the important function of giving Salsa
users access to the appropriate contact channels and source code
reference.
I am sure that my patch would be rejected by upstream. As I have it,
it is not suitable for upstream because it hardcodes the Debian
information. I obviouslyu do not want to spend the time to redevelop
the configurable version (like the proprietary version of gitlab has)
when you have said you will rejected it, and it would also almost
certainly be rejected by upstream.
Can you please tell me what you think the appropriate path or venue is
for me to pursue this diagreement ?
Thanks,
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
On Fri, 25 May 2018, Ian Jackson wrote:
> Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
> code details [and 1 more messages]"):
> > > Can you point me to the source code for Salsa's gitlab instance,
> > > please ?
> > https://salsa.debian.org/salsa/gitlab-ce
>
> I think I see where to make the change. How should I test it ?
>
> If I am right the file that needs to be changed very small, and has
> not been edited at all since September. In the last year there were
> two conflicting edits, but they were trivial to resolve. If this
> turns out to be a problem for you then I am happy for you to drop this
> change each time this happens, and I will resolve the conflict myself
> and send a new MR.
It was a decision by the team to disallow any patch that is not really really
needed
for function. Please submit your patch upstream.
Alex
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
code details [and 1 more messages]"):
> > Can you point me to the source code for Salsa's gitlab instance,
> > please ?
> https://salsa.debian.org/salsa/gitlab-ce
I think I see where to make the change. How should I test it ?
If I am right the file that needs to be changed very small, and has
not been edited at all since September. In the last year there were
two conflicting edits, but they were trivial to resolve. If this
turns out to be a problem for you then I am happy for you to drop this
change each time this happens, and I will resolve the conflict myself
and send a new MR.
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
On Fri, 25 May 2018, Ian Jackson wrote:
> Quoting my own other mail for more context:
>
> Ian Jackson writes ("Re: Want to make salsa advertise contact and source code
> details"):
> > Alexander Wirt tells me that that feature is "EE only", ie AIUI
> > that the Gitlab company have kept that feature proprietary.
> >
> > That means our choices are:
> ...
> > (ii) Implement the footer as a hardcoded change, where the footer is
> >not configurable but is simply in the source code to our version.
> >
> > (iii) Leave things as they are, with no references to what the service
> >is, who runs it, how to report issues, and to its source code.
>
> Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
> code details"):
> > Its not a matter of free software, but a matter of us having to
> > support those patches - which is something we don't want to do.
>
> I don't understand what "support" you think my proposed change
> ((ii), above) would need, that would be too difficult.
Every patch you have is a pain in the ass. You have to adapt and support it
for every version.
> I don't know how often you update from upstream but I doubt the merge
> conflicts will be frequent or difficult, and if it's a simple
> statically-determined footer then there are few moving parts to go
> wrong.
at least twice a month.
> Can you point me to the source code for Salsa's gitlab instance,
> please ?
https://salsa.debian.org/salsa/gitlab-ce
Alex
Re: Want to make salsa advertise contact and source code details [and 1 more messages]
Quoting my own other mail for more context:
Ian Jackson writes ("Re: Want to make salsa advertise contact and source code
details"):
> Alexander Wirt tells me that that feature is "EE only", ie AIUI
> that the Gitlab company have kept that feature proprietary.
>
> That means our choices are:
...
> (ii) Implement the footer as a hardcoded change, where the footer is
>not configurable but is simply in the source code to our version.
>
> (iii) Leave things as they are, with no references to what the service
>is, who runs it, how to report issues, and to its source code.
Alexander Wirt writes ("Re: Want to make salsa advertise contact and source
code details"):
> Its not a matter of free software, but a matter of us having to
> support those patches - which is something we don't want to do.
I don't understand what "support" you think my proposed change
((ii), above) would need, that would be too difficult.
I don't know how often you update from upstream but I doubt the merge
conflicts will be frequent or difficult, and if it's a simple
statically-determined footer then there are few moving parts to go
wrong.
Can you point me to the source code for Salsa's gitlab instance,
please ?
Ian.
