| 28 Apr 2021 |
 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:matrix.org | 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 |
| proletarius101 | I'm not sure but, it seems the search fab is already white? _hc | 10:49:25 |
| _hc | proletarius101: hmm yes it is in 1.13-alpha0, I just upgraded. | 11:24:10 |
|  @freenode_kempe:matrix.org left the room. | 12:14:48 |
| @freenode_kempe:matrix.org joined the room. | 12:15:45 |
|  @freenode_romo:matrix.org joined the room. | 20:49:08 |
| @freenode_romo:matrix.org | hey guys. I'm currently trying to verify F-Droid.apk. so far I've pulled one pubkey from keyserver.ubuntu.com and another copy from gitlab fdroidclient repo. they both return "key has expired". is there a secure download source for a current pubkey? | 20:52:20 |
 @obfusk:matrix.org | it looks like the subkeys for the admin@f-droid.org GPG key expired on 2021-04-24 | 20:56:26 |
| @freenode_romo:matrix.org | so, as long as the fingerprint matches f-droid.orgs "release channels and signing keys" and gpg reports "good signature", the pubkey from gitlab.com/fdroid/fdroidclinet should be a-okay to use now? | 21:01:49 |
| @obfusk:matrix.org | romo: it was a-okay 4 days ago. this should be fixed, but I have no reason to believe anything has changed in the last 4 days. | 21:04:28 |
| @freenode_romo:matrix.org | 幸猫: okay, thank you for the help. I was starting to doubt my ability to either download things or import keys. | 21:08:36 |
| @obfusk:matrix.org | romo: I just verified (on my end at least) that https://f-droid.org/F-Droid.apk.asc is made using the same GPG key, and that the APK is signed with the same APK key, as the GPG signature and APK from October that were still sitting in my downloads folder. all fingerprints match what's listed in https://f-droid.org/en/docs/Release_Channels_and_Signing_Keys/. | 21:23:50 |
| @obfusk:matrix.org | _hc: ^ | 21:26:25 |
| @freenode_romo:matrix.org | 幸猫: thank you very much for taking the time to recheck, that'll do. I'm now feeling confident populating my phone with all things useful and fun. | 21:29:19 |
| 29 Apr 2021 |
| @freenode_romo:matrix.org left the room. | 00:41:02 |
|  jochensp left the room. | 01:09:07 |
| jochensp joined the room. | 01:09:09 |
