| 27 Apr 2021 |
 _hc | stencil: I don't know, but I do know that it would be great if we had translators who took charge of organizing things like glossaries in Weblate. | 14:18:52 |
| _hc | jochensp: in fdroid buildsserver's case, the steps are encoded in provisioning scripts, which can easily be run in a Dockerfile | 14:19:41 |
|  kempe left the room. | 16:28:47 |
| kempe joined the room. | 16:29:10 |
|  foobar48 left the room. | 19:31:17 |
| 28 Apr 2021 |
|  jochensp1 joined the room. | 01:07:47 |
|  jochensp left the room. | 01:10:11 |
| jochensp joined the room. | 02:48:24 |
 linsui | Is https://f-droid.org/ down? | 04:16:59 |
 cdesai | I can ping it but it isn't loading. | 04:24:41 |
| cdesai | yep my CI job that downloads f-droid apps failed too, connection timed out | 04:26:44 |
| linsui | Port 80 works but 443 only responses the first tcping. | 04:28:22 |
| linsui | It works now. | 06:27:34 |
 proletarius101 | I remember there is a change in merging strategy. There is not a rebase button in merge requests | 07:27:25 |
| proletarius101 | Is that intentional? | 07:27:44 |
 FestplattenSchnitzel | Which project? fdroiddata? | 07:42:09 |
| proletarius101 | In reply to @proletarius101:matrix.org
I remember there is a change in merging strategy. There is not a rebase button in merge requests Oh there are. But what is the strategy now? Not possible to just merge when the main branch changes? | 07:42:12 |
| proletarius101 | In reply to @festplattenschnitzel:matrix.org
Which project? fdroiddata? Yes | 07:42:14 |
| FestplattenSchnitzel | In reply to @proletarius101:matrix.org
Oh there are. But what is the strategy now? Not possible to just merge when the main branch changes? AFAIK We do "Fast-forward merging" at the moment …
https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html | 07:44:50 |
| proletarius101 | Hmm, maybe squash all commits would make it work? Given that the file I change doesn't overlap with any main branch changes. I'm not that familiar with fast forward | 07:47:21 |
| cdesai | fast forward simply avoids creating merge commits to have a linear history | 07:49:01 |
| cdesai | so it will try to merge if that won't create a merge commit, otherwise it'll rebase. | 07:49:19 |
| cdesai | https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html | 07:49:33 |
| proletarius101 | In reply to @freenode_cdesai:matrix.org
so it will try to merge if that won't create a merge commit, otherwise it'll rebase. Thanks! Trying to understand | 08:04:18 |
| cdesai | _hc: not sure if you noticed, but | 09:58:55 |
| cdesai | 8.5MB 1.12-alpha* | 09:58:56 |
| cdesai | 8.2MB 1.12.1 | 09:58:56 |
| cdesai | 7.2MB 1.13-alpha0 | 09:58:56 |
| _hc | cdesai: yeah, proletarius101 converted all the PNGs to vector drawables! Nice little benefit | 10:27:56 |
| _hc | also less libs needed since the minSdk is 22 | 10:30:04 |
