From db2b796165f8c1cae00958f05cd6dda506727617 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 29 Jan 2018 16:52:02 +0530 Subject: [PATCH] Update Github URLs with Salsa URLs Signed-off-by: Sunil Mohan Adapa Reviewed-by: Joseph Nuthalapati --- CONTRIBUTING.md | 2 +- HACKING.md | 5 +++-- debian/control | 6 +++--- debian/copyright | 2 +- doc/plinth.xml | 4 ++-- plinth/modules/help/templates/statuslog.html | 8 ++++---- plinth/templates/404.html | 6 +++--- plinth/templates/500.html | 10 +++++----- plinth/templates/index.html | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8a282094d..55183f8b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,7 +96,7 @@ Naming conventions: ## Use of GPG -* Sign all commits with GPG. This means avoiding GitHub's fancy merge and rebase +* Sign all commits with GPG. This means avoiding GitLab's fancy merge and rebase buttons and doing it locally, where your private key is. * In case a contributor signed with GPG, rebasing will strip it away. To compensate, put your GPG signature on the rebased commits. Given that we have diff --git a/HACKING.md b/HACKING.md index 238e1f9f9..ddce1b786 100644 --- a/HACKING.md +++ b/HACKING.md @@ -152,12 +152,13 @@ $ make -C doc ## Repository -Plinth is available from [GitHub](https://github.com/freedombox/plinth). +Plinth is available from +[salsa.debian.org](https://salsa.debian.org/freedombox-team/plinth). ## Bugs & TODO You can report bugs on Plinth's [issue -tracker](https://github.com/freedombox/Plinth/issues). +tracker](https://salsa.debian.org/freedombox-team/plinth/issues). See CONTRIBUTING.md for information how to best contribute code. diff --git a/debian/control b/debian/control index a01238c0c..69bbe28de 100644 --- a/debian/control +++ b/debian/control @@ -37,9 +37,9 @@ Build-Depends: debhelper (>= 10~) , python3-setuptools-git , xmlto Standards-Version: 4.1.2 -Homepage: https://github.com/freedombox/Plinth -Vcs-Git: https://github.com/freedombox/Plinth.git -Vcs-Browser: https://github.com/freedombox/Plinth +Homepage: https://salsa.debian.org/freedombox-team/plinth +Vcs-Git: https://salsa.debian.org/freedombox-team/plinth.git +Vcs-Browser: https://salsa.debian.org/freedombox-team/plinth Package: plinth Breaks: freedombox-setup (<< 0.11~) diff --git a/debian/copyright b/debian/copyright index 62a71b46f..93fceb534 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: https://github.com/freedombox/Plinth +Source: https://salsa.debian.org/freedombox-team/plinth Upstream-Name: Plinth Files-Excluded: plinth/modules/jsxc/static/img plinth/modules/jsxc/static/libjs-jsxc/* diff --git a/doc/plinth.xml b/doc/plinth.xml index a6c8a186a..c3bc2a684 100644 --- a/doc/plinth.xml +++ b/doc/plinth.xml @@ -214,8 +214,8 @@ Bugs See Plinth issue - tracker for a full list of known issues and TODO items. + url="https://salsa.debian.org/freedombox-team/plinth/issues">Plinth + issue tracker for a full list of known issues and TODO items. diff --git a/plinth/modules/help/templates/statuslog.html b/plinth/modules/help/templates/statuslog.html index f7f5917ca..fd4765e9f 100644 --- a/plinth/modules/help/templates/statuslog.html +++ b/plinth/modules/help/templates/statuslog.html @@ -26,10 +26,10 @@

{% blocktrans trimmed %} - These are the last {{ num_lines }} lines of the status log for - this web interface. If you want to report a bug, please use the - bug tracker and - attach this status log to the bug report. + These are the last {{ num_lines }} lines of the status log for this web + interface. If you want to report a bug, please use the bug + tracker and attach this status log to the bug report. {% endblocktrans %}

diff --git a/plinth/templates/404.html b/plinth/templates/404.html index a91cf2181..2523980d5 100644 --- a/plinth/templates/404.html +++ b/plinth/templates/404.html @@ -32,9 +32,9 @@

{% blocktrans trimmed %} - If you believe this missing page should exist, please file a bug - at the Plinth project - issue + If you believe this missing page should exist, please file a bug at the + Plinth project issue tracker. {% endblocktrans %}

diff --git a/plinth/templates/500.html b/plinth/templates/500.html index 2fbb14a48..3bd784e1f 100644 --- a/plinth/templates/500.html +++ b/plinth/templates/500.html @@ -27,11 +27,11 @@

{% url 'help:status-log' as status_log_url %} {% blocktrans trimmed %} - This is an internal error and not something you caused or can - fix. Please report the error on - the bug - tracker so we can fix it. Also, please attach the - status log to the bug report. + This is an internal error and not something you caused or can fix. Please + report the error on the bug + tracker so we can fix it. Also, please attach the status log to the bug report. {% endblocktrans %}

diff --git a/plinth/templates/index.html b/plinth/templates/index.html index 7fc3be791..e230fc52d 100644 --- a/plinth/templates/index.html +++ b/plinth/templates/index.html @@ -135,7 +135,7 @@ {% trans "Homepage" %}

- {% trans "Source Code" %} + {% trans "Source Code" %}

{% trans "Donate" %}