From 30b6e069b3ddd66de255a5f23498def1d04f217d Mon Sep 17 00:00:00 2001 From: Jorge Maldonado Ventura Date: Thu, 14 Jun 2018 11:43:06 +0200 Subject: [PATCH 1/4] Replace GitHub URLs with GitLab URLs where they reference the Liberapay project --- README.md | 6 +++--- i18n/core/ar.po | 2 +- i18n/core/ca.po | 4 ++-- i18n/core/cs.po | 5 +++-- i18n/core/da.po | 4 ++-- i18n/core/de.po | 4 ++-- i18n/core/el.po | 2 +- i18n/core/eo.po | 4 ++-- i18n/core/es.po | 4 ++-- i18n/core/et.po | 2 +- i18n/core/fi.po | 2 +- i18n/core/fr.po | 4 ++-- i18n/core/fy.po | 2 +- i18n/core/ga.po | 2 +- i18n/core/hu.po | 2 +- i18n/core/id.po | 2 +- i18n/core/it.po | 4 ++-- i18n/core/ja.po | 2 +- i18n/core/ko.po | 4 ++-- i18n/core/lt.po | 2 +- i18n/core/lv.po | 2 +- i18n/core/ms.po | 4 ++-- i18n/core/nb.po | 4 ++-- i18n/core/nl.po | 4 ++-- i18n/core/pl.po | 5 +++-- i18n/core/pt.po | 4 ++-- i18n/core/ro.po | 4 ++-- i18n/core/ru.po | 4 ++-- i18n/core/sk.po | 2 +- i18n/core/sl.po | 2 +- i18n/core/sv.po | 4 ++-- i18n/core/tr.po | 2 +- i18n/core/uk.po | 4 ++-- i18n/core/zh.po | 4 ++-- js/avatar-fallback.js | 2 +- js/payment-cards.js | 2 +- liberapay/billing/payday.py | 2 +- liberapay/utils/state_chain.py | 4 ++-- liberapay/wireup.py | 2 +- release.sh | 2 +- templates/base.html | 2 +- www/about/contact.spt | 4 ++-- www/about/feeds.spt | 6 +++--- www/about/index.spt | 6 +++--- www/about/money.spt | 2 +- www/about/security.spt | 4 ++-- www/humans.txt | 3 +-- www/index.html.spt | 6 +++--- 48 files changed, 80 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 81611767df..8ad473a431 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Note: This webapp is not self-hostable. You want to chat? [Join us on Gitter](https://gitter.im/liberapay/salon). (If you use IRC, [Gitter has a gateway](https://irc.gitter.im/), and we're also in the #liberapay channel on Freenode.) -Alternatively you can post a message in [our GitHub salon](https://github.com/liberapay/salon). +Alternatively you can post a message in [our GitHub salon](https://gitlab.com/liberapay/salon). ## Contributing to the translations @@ -47,7 +47,7 @@ You can help translate Liberapay [via Weblate](https://hosted.weblate.org/engage [![translation status by language](https://hosted.weblate.org/widgets/liberapay/-/multi-auto.svg)](https://hosted.weblate.org/projects/liberapay/core/?utm_source=widget) -If you have questions about translating Liberapay, you can ask them [in the salon](https://github.com/liberapay/salon/labels/i18n). +If you have questions about translating Liberapay, you can ask them [in the salon](https://gitlab.com/liberapay/salon/?label_name[]=i18n). ## Contributing to the code @@ -218,4 +218,4 @@ All arguments are passed to the underlying `py.test` command, so you can use `-x ## License -[CC0 Public Domain Dedication](http://creativecommons.org/publicdomain/zero/1.0/) (See [this discussion](https://github.com/liberapay/liberapay.com/issues/564) for details.) +[CC0 Public Domain Dedication](http://creativecommons.org/publicdomain/zero/1.0/) (See [this discussion](https://gitlab.com/liberapay/liberapay.com/issues/564) for details.) diff --git a/i18n/core/ar.po b/i18n/core/ar.po index b3574c1fa4..238943fb6f 100644 --- a/i18n/core/ar.po +++ b/i18n/core/ar.po @@ -2925,7 +2925,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "للإبلاغ عن مشكلة أو تقديم اقتراح باللغة الإنكليزية :" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/ca.po b/i18n/core/ca.po index 26633362fa..f53eb1746c 100644 --- a/i18n/core/ca.po +++ b/i18n/core/ca.po @@ -2860,8 +2860,8 @@ msgstr "No tenim cap número de telèfon." msgid "To report a problem or make a suggestion in English:" msgstr "Per a informar d'un problema o fer un suggeriment en anglès:" -msgid "Open an issue on GitHub" -msgstr "Obriu un tema a GitHub" +msgid "Open an issue on GitLab" +msgstr "Obriu un tema a GitLab" msgid "Other communication channels:" msgstr "Altres canals de comunicació:" diff --git a/i18n/core/cs.po b/i18n/core/cs.po index fd51d3fb44..eed8025463 100644 --- a/i18n/core/cs.po +++ b/i18n/core/cs.po @@ -2882,8 +2882,9 @@ msgstr "V současné době nemáme telefonní číslo." msgid "To report a problem or make a suggestion in English:" msgstr "Nahlásit chybu nebo námět v angličtině:" -msgid "Open an issue on GitHub" -msgstr "Nahlašte problém na Githubu" +#, fuzzy +msgid "Open an issue on GitLab" +msgstr "Nahlašte problém na Gitlabu" msgid "Other communication channels:" msgstr "Další komunikační kanály:" diff --git a/i18n/core/da.po b/i18n/core/da.po index 023a0234c3..37ff7e505b 100644 --- a/i18n/core/da.po +++ b/i18n/core/da.po @@ -2864,8 +2864,8 @@ msgstr "Vi har for tiden ikke et telefonnummer." msgid "To report a problem or make a suggestion in English:" msgstr "For at rapportere et problem eller give et forslag på engelsk:" -msgid "Open an issue on GitHub" -msgstr "Åbn en problem-forespørgsel på GitHub" +msgid "Open an issue on GitLab" +msgstr "Åbn en problem-forespørgsel på GitLab" msgid "Other communication channels:" msgstr "Andre kommunikations-kanaler:" diff --git a/i18n/core/de.po b/i18n/core/de.po index e22978af19..0912aa5b5a 100644 --- a/i18n/core/de.po +++ b/i18n/core/de.po @@ -2861,8 +2861,8 @@ msgstr "Derzeit haben wir keine Telefonnummer." msgid "To report a problem or make a suggestion in English:" msgstr "Melden Sie ein Problem oder machen Sie einen Vorschlag in englischer Sprache:" -msgid "Open an issue on GitHub" -msgstr "Öffnen Sie ein Thema auf GitHub" +msgid "Open an issue on GitLab" +msgstr "Öffnen Sie ein Thema auf GitLab" msgid "Other communication channels:" msgstr "Andere Kommunikationswege:" diff --git a/i18n/core/el.po b/i18n/core/el.po index 8dc85daf4e..1547ee0154 100644 --- a/i18n/core/el.po +++ b/i18n/core/el.po @@ -2858,7 +2858,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/eo.po b/i18n/core/eo.po index 41d8af732e..40ba9a3451 100644 --- a/i18n/core/eo.po +++ b/i18n/core/eo.po @@ -2864,8 +2864,8 @@ msgstr "Ni ne havas telefonnumeron nun." msgid "To report a problem or make a suggestion in English:" msgstr "Por raporti problemon aŭ fari sugeston en la Angla:" -msgid "Open an issue on GitHub" -msgstr "Kreu atentindaĵon en GitHub" +msgid "Open an issue on GitLab" +msgstr "Kreu atentindaĵon en GitLab" msgid "Other communication channels:" msgstr "Aliaj komunikaj medioj:" diff --git a/i18n/core/es.po b/i18n/core/es.po index 5e640454c9..e71c96b3d7 100644 --- a/i18n/core/es.po +++ b/i18n/core/es.po @@ -2860,8 +2860,8 @@ msgstr "En este momento no tenemos un número de teléfono." msgid "To report a problem or make a suggestion in English:" msgstr "Para informar de un problema o hacer una sugerencia en inglés:" -msgid "Open an issue on GitHub" -msgstr "Abrir un tema en GitHub" +msgid "Open an issue on GitLab" +msgstr "Abrir un tema en GitLab" msgid "Other communication channels:" msgstr "Otros canales de comunicación:" diff --git a/i18n/core/et.po b/i18n/core/et.po index 64d2b23e88..e3bea010e4 100644 --- a/i18n/core/et.po +++ b/i18n/core/et.po @@ -2857,7 +2857,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/fi.po b/i18n/core/fi.po index 459be0333c..cd40d5c1c2 100644 --- a/i18n/core/fi.po +++ b/i18n/core/fi.po @@ -2861,7 +2861,7 @@ msgstr "Meillä ei tällä hetkellä ole puhelinnumeroa." msgid "To report a problem or make a suggestion in English:" msgstr "Ilmoittaaksesi ongelmasta tai ehdottaaksesi jotain englanniksi:" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "Avaa issue Githubissa" msgid "Other communication channels:" diff --git a/i18n/core/fr.po b/i18n/core/fr.po index 92759c7f57..cb7e902254 100644 --- a/i18n/core/fr.po +++ b/i18n/core/fr.po @@ -2860,8 +2860,8 @@ msgstr "Nous n'avons pas encore de numéro de téléphone." msgid "To report a problem or make a suggestion in English:" msgstr "Pour signaler un problème ou faire une suggestion en anglais :" -msgid "Open an issue on GitHub" -msgstr "Créez un ticket sur GitHub" +msgid "Open an issue on GitLab" +msgstr "Créez un ticket sur GitLab" msgid "Other communication channels:" msgstr "Autres canaux de communication :" diff --git a/i18n/core/fy.po b/i18n/core/fy.po index 6a174dc928..fcb3327a36 100644 --- a/i18n/core/fy.po +++ b/i18n/core/fy.po @@ -2857,7 +2857,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/ga.po b/i18n/core/ga.po index ff3c3212e2..4aa60731a4 100644 --- a/i18n/core/ga.po +++ b/i18n/core/ga.po @@ -2874,7 +2874,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/hu.po b/i18n/core/hu.po index 6a681fdda5..d5e7094cde 100644 --- a/i18n/core/hu.po +++ b/i18n/core/hu.po @@ -2861,7 +2861,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/id.po b/i18n/core/id.po index 4830e40550..7027abcc92 100644 --- a/i18n/core/id.po +++ b/i18n/core/id.po @@ -2842,7 +2842,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/it.po b/i18n/core/it.po index 883837759e..01967154ba 100644 --- a/i18n/core/it.po +++ b/i18n/core/it.po @@ -2860,8 +2860,8 @@ msgstr "Al momento non abbiamo un numero di telefono." msgid "To report a problem or make a suggestion in English:" msgstr "Per segnalare un problema o inviare suggerimenti in inglese:" -msgid "Open an issue on GitHub" -msgstr "Apri un reclamo su GitHub" +msgid "Open an issue on GitLab" +msgstr "Apri un reclamo su GitLab" msgid "Other communication channels:" msgstr "Altri canali di comunicazione:" diff --git a/i18n/core/ja.po b/i18n/core/ja.po index 2c3403f98a..f87c173d41 100644 --- a/i18n/core/ja.po +++ b/i18n/core/ja.po @@ -2840,7 +2840,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/ko.po b/i18n/core/ko.po index 617003c4ee..435dcc2a8f 100644 --- a/i18n/core/ko.po +++ b/i18n/core/ko.po @@ -2843,8 +2843,8 @@ msgstr "현재는 전화번호가 없습니다." msgid "To report a problem or make a suggestion in English:" msgstr "영어로 문제를 보고하거나 제안할 사항이 있다면:" -msgid "Open an issue on GitHub" -msgstr "GitHub에 이슈를 열어 주세요" +msgid "Open an issue on GitLab" +msgstr "GitLab에 이슈를 열어 주세요" msgid "Other communication channels:" msgstr "다른 커뮤니케이션 채널:" diff --git a/i18n/core/lt.po b/i18n/core/lt.po index 03c2ed49a7..ef9bfb2487 100644 --- a/i18n/core/lt.po +++ b/i18n/core/lt.po @@ -2874,7 +2874,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/lv.po b/i18n/core/lv.po index b33805762c..301d85d9ce 100644 --- a/i18n/core/lv.po +++ b/i18n/core/lv.po @@ -2874,7 +2874,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/ms.po b/i18n/core/ms.po index bfcb14a3e5..d52f7c2eb0 100644 --- a/i18n/core/ms.po +++ b/i18n/core/ms.po @@ -2862,8 +2862,8 @@ msgstr "Kami masih belum mempunyai nombor telefon." msgid "To report a problem or make a suggestion in English:" msgstr "Untuk melaporkan masalah atau memberi cadangan dalam bahasa Inggeris:" -msgid "Open an issue on GitHub" -msgstr "Buka isu di GitHub" +msgid "Open an issue on GitLab" +msgstr "Buka isu di GitLab" msgid "Other communication channels:" msgstr "Saluran perhubungan yang lain:" diff --git a/i18n/core/nb.po b/i18n/core/nb.po index 162f49748b..16d626b1f6 100644 --- a/i18n/core/nb.po +++ b/i18n/core/nb.po @@ -2870,8 +2870,8 @@ msgstr "Vi har foreløpig ikke noe telefonnummer." msgid "To report a problem or make a suggestion in English:" msgstr "For å rapportere et problem, eller foreslå noe på Engelsk:" -msgid "Open an issue on GitHub" -msgstr "Innrapporter feil på GitHub" +msgid "Open an issue on GitLab" +msgstr "Innrapporter feil på GitLab" msgid "Other communication channels:" msgstr "Andre kommunikasjonskanaler:" diff --git a/i18n/core/nl.po b/i18n/core/nl.po index 40684c4e95..67303cec58 100644 --- a/i18n/core/nl.po +++ b/i18n/core/nl.po @@ -2861,8 +2861,8 @@ msgstr "Momenteel hebben wij geen telefoonnummer." msgid "To report a problem or make a suggestion in English:" msgstr "Meld een probleem of een doe een suggestie (alleen in het Engels):" -msgid "Open an issue on GitHub" -msgstr "Open een issue op GitHub" +msgid "Open an issue on GitLab" +msgstr "Open een issue op GitLab" msgid "Other communication channels:" msgstr "Andere communicatiekanalen:" diff --git a/i18n/core/pl.po b/i18n/core/pl.po index ed2676ce15..eb6448729f 100644 --- a/i18n/core/pl.po +++ b/i18n/core/pl.po @@ -2878,8 +2878,9 @@ msgstr "Aktualnie nie posiadamy numeru telefonu." msgid "To report a problem or make a suggestion in English:" msgstr "By zgłosić problem lub coś zasugerować w języku angielskim:" -msgid "Open an issue on GitHub" -msgstr "Zgłoś problem na GitHubie" +#, fuzzy +msgid "Open an issue on GitLab" +msgstr "Zgłoś problem na GitLabie" msgid "Other communication channels:" msgstr "Inne kanały komunikacyjne:" diff --git a/i18n/core/pt.po b/i18n/core/pt.po index f30f12bdcd..747690da91 100644 --- a/i18n/core/pt.po +++ b/i18n/core/pt.po @@ -2860,8 +2860,8 @@ msgstr "Atualmente não temos um número de telefone." msgid "To report a problem or make a suggestion in English:" msgstr "Para relatar um problema ou fazer uma sugestão em inglês:" -msgid "Open an issue on GitHub" -msgstr "Abra um problema no GitHub" +msgid "Open an issue on GitLab" +msgstr "Abra um problema no GitLab" msgid "Other communication channels:" msgstr "Outros canais de comunicação:" diff --git a/i18n/core/ro.po b/i18n/core/ro.po index 7d34e43d45..c0d8260264 100644 --- a/i18n/core/ro.po +++ b/i18n/core/ro.po @@ -2880,8 +2880,8 @@ msgstr "Momentan nu avem un număr de telefon." msgid "To report a problem or make a suggestion in English:" msgstr "Pentru a raporta o promblemă sau a face o sugestie în engleză:" -msgid "Open an issue on GitHub" -msgstr "Deschideți o problemă pe GitHub" +msgid "Open an issue on GitLab" +msgstr "Deschideți o problemă pe GitLab" msgid "Other communication channels:" msgstr "Alte canale de comunicare:" diff --git a/i18n/core/ru.po b/i18n/core/ru.po index 02f0fee20c..eb3d52e069 100644 --- a/i18n/core/ru.po +++ b/i18n/core/ru.po @@ -2877,8 +2877,8 @@ msgstr "В данный момент у нас нет номера телефо msgid "To report a problem or make a suggestion in English:" msgstr "Чтобы сообщить о проблеме или внести предложение на английском языке:" -msgid "Open an issue on GitHub" -msgstr "Открыть тему на GitHub" +msgid "Open an issue on GitLab" +msgstr "Открыть тему на GitLab" msgid "Other communication channels:" msgstr "Другие способы связи:" diff --git a/i18n/core/sk.po b/i18n/core/sk.po index 0edfd1c722..d51985b874 100644 --- a/i18n/core/sk.po +++ b/i18n/core/sk.po @@ -2874,7 +2874,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/sl.po b/i18n/core/sl.po index 07af9c30a7..b0839f588a 100644 --- a/i18n/core/sl.po +++ b/i18n/core/sl.po @@ -2891,7 +2891,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/sv.po b/i18n/core/sv.po index aca9340a7c..868b406e17 100644 --- a/i18n/core/sv.po +++ b/i18n/core/sv.po @@ -2862,8 +2862,8 @@ msgstr "Vi har förnuvarande inte något telefonnummer." msgid "To report a problem or make a suggestion in English:" msgstr "För att rapportera ett problem eller skicka in ett förslag på Engelska:" -msgid "Open an issue on GitHub" -msgstr "Öppna ett ärende på GitHub" +msgid "Open an issue on GitLab" +msgstr "Öppna ett ärende på GitLab" msgid "Other communication channels:" msgstr "Andra kommunikationskanaler:" diff --git a/i18n/core/tr.po b/i18n/core/tr.po index 13cfab60ac..3c8b6c7740 100644 --- a/i18n/core/tr.po +++ b/i18n/core/tr.po @@ -2860,7 +2860,7 @@ msgstr "" msgid "To report a problem or make a suggestion in English:" msgstr "" -msgid "Open an issue on GitHub" +msgid "Open an issue on GitLab" msgstr "" msgid "Other communication channels:" diff --git a/i18n/core/uk.po b/i18n/core/uk.po index 32ad015c65..0206e200a5 100644 --- a/i18n/core/uk.po +++ b/i18n/core/uk.po @@ -2877,8 +2877,8 @@ msgstr "Наразі у нас немає номера телефону." msgid "To report a problem or make a suggestion in English:" msgstr "Щоб повідомити про проблему або внести пропозицію на английській мові:" -msgid "Open an issue on GitHub" -msgstr "Відкрити тему в GitHub" +msgid "Open an issue on GitLab" +msgstr "Відкрити тему в GitLab" msgid "Other communication channels:" msgstr "Інші способи зв'язку:" diff --git a/i18n/core/zh.po b/i18n/core/zh.po index 2c0ce8a821..7f78ba4109 100644 --- a/i18n/core/zh.po +++ b/i18n/core/zh.po @@ -2845,8 +2845,8 @@ msgstr "我們目前沒有電話號碼。" msgid "To report a problem or make a suggestion in English:" msgstr "要用英文回報問題或是提建議：" -msgid "Open an issue on GitHub" -msgstr "在GitHub發出問題" +msgid "Open an issue on GitLab" +msgstr "在GitLab發出問題" msgid "Other communication channels:" msgstr "其它的溝通管道：" diff --git a/js/avatar-fallback.js b/js/avatar-fallback.js index dc8373eb0e..04f5eb7709 100644 --- a/js/avatar-fallback.js +++ b/js/avatar-fallback.js @@ -1,6 +1,6 @@ /* This is a temporary hack. There is no reliable cross-browser way to replace * broken images. However we can remove the need for this by proxying images: - * https://github.com/liberapay/liberapay.com/issues/202 + * https://gitlab.com/liberapay/liberapay.com/issues/202 */ $('img.avatar').on('error', function () { this.src = Liberapay.avatar_default_url; diff --git a/js/payment-cards.js b/js/payment-cards.js index d89055fa9f..d4979db128 100644 --- a/js/payment-cards.js +++ b/js/payment-cards.js @@ -1,4 +1,4 @@ -// https://github.com/liberapay/payment-cards.js +// https://gitlab.com/liberapay/payment-cards.js var PaymentCards = function () { diff --git a/liberapay/billing/payday.py b/liberapay/billing/payday.py index ebbbf985f1..85912f6122 100644 --- a/liberapay/billing/payday.py +++ b/liberapay/billing/payday.py @@ -1031,7 +1031,7 @@ def main(override_payday_checks=False): from liberapay.billing.transactions import sync_with_mangopay from liberapay.main import website - # https://github.com/liberapay/salon/issues/19#issuecomment-191230689 + # https://gitlab.com/liberapay/salon/issues/19#issuecomment-191230689 from liberapay.billing.payday import Payday if not website.env.override_payday_checks and not override_payday_checks: diff --git a/liberapay/utils/state_chain.py b/liberapay/utils/state_chain.py index c6deaed579..8715ec4968 100644 --- a/liberapay/utils/state_chain.py +++ b/liberapay/utils/state_chain.py @@ -192,7 +192,7 @@ def turn_socket_error_into_50X(website, exception, _=lambda a: a, response=None) def bypass_csp_for_form_redirects(response, state, website, request=None): if request is None: return - # https://github.com/liberapay/liberapay.com/issues/952 + # https://gitlab.com/liberapay/liberapay.com/issues/952 if request.method == 'POST' and response.code == 302: target = response.headers[b'Location'] is_internal = ( @@ -228,7 +228,7 @@ def overwrite_status_code_of_gateway_errors(response): """This function changes 502 and 504 response codes to 500. Why? Because CloudFlare masks our error page if we return a 502 or 504: - https://github.com/liberapay/liberapay.com/issues/592 + https://gitlab.com/liberapay/liberapay.com/issues/592 """ if response.code in (502, 504): response.code = 500 diff --git a/liberapay/wireup.py b/liberapay/wireup.py index 8d9f31f180..d71cc8f8d3 100644 --- a/liberapay/wireup.py +++ b/liberapay/wireup.py @@ -433,7 +433,7 @@ def tell_sentry(exception, state, allow_reraise=True): if isinstance(exception, ValueError): if 'cannot contain NUL (0x00) characters' in str(exception): - # https://github.com/liberapay/liberapay.com/issues/675 + # https://gitlab.com/liberapay/liberapay.com/issues/675 response = state.get('response') or pando.Response() response.code = 400 response.body = str(exception) diff --git a/release.sh b/release.sh index 8e608375e0..376315ec9d 100755 --- a/release.sh +++ b/release.sh @@ -158,6 +158,6 @@ if [ "$run_schema_diff" = 'yes' ]; then fi fi -# Push to GitHub +# Push to GitLab git push git push --tags diff --git a/templates/base.html b/templates/base.html index a2c186b352..a6ce9d7c2b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -122,7 +122,7 @@

{{ title }}

  • {{ fontawesome('medium', 'Medium') }}
  • {{ fontawesome('mastodon', 'Mastodon') }}
  • {{ fontawesome('diaspora', 'Diaspora*') }}
    • -
  • {{ fontawesome('github', 'GitHub') }}
    • +
  • {{ fontawesome('gitlab', 'GitLab') }}
  • {{ fontawesome('twitter', 'Twitter') }}
  • {{ fontawesome('facebook', 'Facebook') }}
    • diff --git a/www/about/contact.spt b/www/about/contact.spt index 3d84ea417c..7330725e35 100644 --- a/www/about/contact.spt +++ b/www/about/contact.spt @@ -12,8 +12,8 @@ title = _("Contact")

    {{ _("To report a problem or make a suggestion in English:") }}

    -

    {{ _("Open an issue on GitHub") }}

    +

    {{ _("Open an issue on GitLab") }}


    {{ _("Other communication channels:") }}

    diff --git a/www/about/feeds.spt b/www/about/feeds.spt index c18beb26cb..4581aa1390 100644 --- a/www/about/feeds.spt +++ b/www/about/feeds.spt @@ -32,9 +32,9 @@ title = _("Feeds") "the {2}adventures of the Liberapay legal entity{0}, and the " "{3}general discussions of the Liberapay team{0}.", ''|safe, - ''|safe, - ''|safe, - ''|safe, + ''|safe, + ''|safe, + ''|safe, ) }}

    diff --git a/www/about/index.spt b/www/about/index.spt index 49a971d4f8..2ea6e67385 100644 --- a/www/about/index.spt +++ b/www/about/index.spt @@ -41,8 +41,8 @@ title = _("Introduction") "share of the money that our users donate to keep the service running.", '    '|safe, ''|safe, - ''|safe, - ''|safe, + ''|safe, + ''|safe, ''|safe ) }}

    @@ -67,7 +67,7 @@ title = _("Introduction")

    {{ _( "Liberapay is a non-profit organization {0}founded in 2015 in France{1} by {2} and {3}.", - ''|safe, + ''|safe, ''|safe, 'Changaco'|safe, 'Zatalyz'|safe, diff --git a/www/about/money.spt b/www/about/money.spt index a59beee32e..8fc4c19cf9 100644 --- a/www/about/money.spt +++ b/www/about/money.spt @@ -51,7 +51,7 @@ title = _("Money")

    {{ _( "Payday is when donations are actually executed. It's a program ({0}this " "one{1}) that we run every Wednesday.", - ''|safe, + ''|safe, ''|safe ) }}

    diff --git a/www/about/security.spt b/www/about/security.spt index cb6647a50d..c3017e1f66 100644 --- a/www/about/security.spt +++ b/www/about/security.spt @@ -2,7 +2,7 @@ liberapay_hof_raw = """ EdOverflow -https://github.com/liberapay/liberapay.com/pull/467 +https://gitlab.com/liberapay/liberapay.com/merge_requests/467 """ gratipay_hof_raw = """\ @@ -118,7 +118,7 @@ title = _("Security")
  • out-of-date software
    • -
  • Issues with no security implications (e.g. spelling mistakes), they should be reported publicly on GitHub.
    • +
  • Issues with no security implications (e.g. spelling mistakes), they should be reported publicly on GitLab.
  • Issues in third-party services, they should be reported to the respective team.

    diff --git a/www/humans.txt b/www/humans.txt index 196f7c668b..b0e85bda55 100644 --- a/www/humans.txt +++ b/www/humans.txt @@ -1,4 +1,3 @@ Liberapay is the result of the work of many people. -The main direct contributors are listed on https://github.com/liberapay/liberapay.com/graphs/contributors?from=2015-05-01 -The contributors to Liberapay's predecessor, Gittip / Gratipay, can be seen on https://github.com/liberapay/liberapay.com/graphs/contributors?to=2015-05-01 +The main contributors are listed on https://github.com/liberapay/liberapay.com/graphs/master Indirect contributors include everyone who has ever contributed to a tool that is or has been used to build Liberapay or its predecessors. Obviously that's a very big list. diff --git a/www/index.html.spt b/www/index.html.spt index b63c5648d3..6e300c4f8b 100644 --- a/www/index.html.spt +++ b/www/index.html.spt @@ -213,12 +213,12 @@ recent = query_cache.one(""" "Liberapay is run transparently by a {1}non-profit organization{0}, " "its {2}source code{0} is public.", ''|safe, - ''|safe, - ''|safe, + ''|safe, + ''|safe, ) }}

    {{ _( "We rely on your support to keep Liberapay running and {link_start}improving{link_end}.", - link_start=''|safe, + link_start=''|safe, link_end=''|safe, ) }}

    Date: Thu, 14 Jun 2018 13:40:28 +0200 Subject: [PATCH 2/4] Start replacing Travis with GitLab-CI --- .gitlab-ci.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 39 --------------------------------------- 2 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..a6b085194c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,45 @@ +stages: + - test_27 + - test_36 + + +variables: + POSTGRES_DB: liberapay_tests + POSTGRES_USER: test_user + POSTGRES_PASSWORD: test_password + DATABASE_URL: postgresql://postgres/$POSTGRES_DB?user=$POSTGRES_USER&password=$POSTGRES_PASSWORD + +test_27: + stage: test_27 + image: python:2.7 + services: + - postgres + before_script: + - apt-get update + - apt-get -y install python-pip postgresql-client + - pip install tox + - ./recreate-schema.sh test + cache: + paths: + - .tox + only: + - master + script: + - tox + +test_36: + stage: test_36 + image: python:3.6 + services: + - postgres + before_script: + - apt-get update + - apt-get -y install python-tox python3-pip postgresql-client + - ./recreate-schema.sh test + cache: + paths: + - .tox + only: + - master + script: + - tox diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bc522c16cc..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -language: python -matrix: - include: - - python: 2.7 - env: TOXENV=py27 - - python: 3.6 - env: TOXENV=py36 -addons: - postgresql: 9.6 -branches: - only: - - master -cache: - directories: - - .tox -before_install: - - tar -xaf ../../liberapay-liberapay.com.tar.gz --strip-components=1 -install: - - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rf .tox; fi - - pip install tox -before_script: - - psql -U postgres -c 'CREATE DATABASE liberapay_tests;' - - DATABASE_URL=liberapay_tests ./recreate-schema.sh test - - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rfv tests/py/fixtures; export LIBERAPAY_I18N_TEST=yes; fi -script: tox -notifications: - email: false - irc: - channels: - - "chat.freenode.net#liberapay" - on_success: change - on_failure: always - template: - - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})" - skip_join: true -sudo: false -dist: trusty -git: - strategy: tarball From 621c02f7f542ccdd49321d1d9a0f096b5265273b Mon Sep 17 00:00:00 2001 From: Jorge Maldonado Ventura Date: Thu, 21 Jun 2018 05:29:06 +0200 Subject: [PATCH 3/4] Make GitLab-CI work --- .gitlab-ci.yml | 41 ++++++++++++++++++++++++++++++----------- tests/test.env | 2 +- tox.ini | 1 - 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6b085194c..139788f864 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,16 @@ stages: - - test_27 - - test_36 + - python_27 + - python_36 + - i18n_test variables: POSTGRES_DB: liberapay_tests - POSTGRES_USER: test_user - POSTGRES_PASSWORD: test_password - DATABASE_URL: postgresql://postgres/$POSTGRES_DB?user=$POSTGRES_USER&password=$POSTGRES_PASSWORD + POSTGRES_USER: liberapay_tests + DATABASE_URL: postgresql://postgres/$POSTGRES_DB?user=$POSTGRES_USER -test_27: - stage: test_27 +python_27: + stage: python_27 image: python:2.7 services: - postgres @@ -25,10 +25,10 @@ test_27: only: - master script: - - tox + - tox -e py27 -test_36: - stage: test_36 +python_36: + stage: python_36 image: python:3.6 services: - postgres @@ -42,4 +42,23 @@ test_36: only: - master script: - - tox + - tox -e py36 + +i18n_test: + stage: i18n_test + only: master + image: python:3.6 + services: + - postgres + before_script: + - apt-get update + - apt-get -y install python-tox python3-pip postgresql-client + - ./recreate-schema.sh test + - export LIBERAPAY_I18N_TEST=yes + cache: + paths: + - .tox + only: + - master + script: + - tox -e py36 diff --git a/tests/test.env b/tests/test.env index 45a6dc8c94..81dc92bdeb 100644 --- a/tests/test.env +++ b/tests/test.env @@ -1,4 +1,4 @@ -DATABASE_URL="dbname=liberapay_tests" +DATABASE_URL="dbname=liberapay_tests host=postgres user=liberapay_tests" CANONICAL_HOST= SENTRY_RERAISE=yes KEEP_PAYDAY_LOGS=no diff --git a/tox.ini b/tox.ini index 082911f74f..57f7de8ad2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,4 @@ [tox] -envlist = py27,py36 skipsdist = True [testenv] From 65c0536a50bc768b39e4b41d991513f6eda44460 Mon Sep 17 00:00:00 2001 From: Jorge Maldonado Ventura Date: Sat, 11 Aug 2018 11:52:42 +0200 Subject: [PATCH 4/4] Add back .travis.yml --- .travis.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..bc522c16cc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,39 @@ +language: python +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.6 + env: TOXENV=py36 +addons: + postgresql: 9.6 +branches: + only: + - master +cache: + directories: + - .tox +before_install: + - tar -xaf ../../liberapay-liberapay.com.tar.gz --strip-components=1 +install: + - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rf .tox; fi + - pip install tox +before_script: + - psql -U postgres -c 'CREATE DATABASE liberapay_tests;' + - DATABASE_URL=liberapay_tests ./recreate-schema.sh test + - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rfv tests/py/fixtures; export LIBERAPAY_I18N_TEST=yes; fi +script: tox +notifications: + email: false + irc: + channels: + - "chat.freenode.net#liberapay" + on_success: change + on_failure: always + template: + - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})" + skip_join: true +sudo: false +dist: trusty +git: + strategy: tarball