From 047fff1649ac212f519ed1912dbbed14e1a15931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Sand=C3=B8y?= Date: Sat, 17 Nov 2018 12:40:12 +0100 Subject: [PATCH 01/11] Replaced most references to GitLab with GitHub. There's still GitLab stuff in the wiki because that needs a proper rewrite, and there's still GitLab stuff in the code jam team pages, because they would break if I changed them. --- .gitlab-ci.yml | 78 ------------------------- package.json | 4 +- pysite/views/error_handlers/http_4xx.py | 4 +- pysite/views/error_handlers/http_5xx.py | 4 +- pysite/views/main/redirects/github.py | 2 +- pysite/views/main/redirects/gitlab.py | 2 +- templates/main/base.html | 2 +- templates/wiki/base.html | 2 +- 8 files changed, 10 insertions(+), 88 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2ea2b632a..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,78 +0,0 @@ -image: pythondiscord/site-ci:latest - -variables: - RABBITMQ_HOST: rabbit - RETHINKDB_HOST: rethinkdb - -stages: - - build - - test - - deploy - -build: - before_script: - - docker info - - image: docker:stable-git - - only: - - master - - services: - - docker:dind - - stage: build - - script: - - sh scripts/deploy-ci.sh - - tags: - - docker - - variables: - DOCKER_DRIVER: overlay2 - -test: - tags: - - docker - - stage: test - services: - - name: rabbitmq:3.7.5-alpine - alias: rabbit - - - name: rethinkdb:2.3.6 - alias: rethinkdb - - cache: - paths: - - ".venv" - - ".gem" - - script: - - pipenv sync --dev - - - pipenv run lint - - pipenv run lintjs - - pipenv run lintscss - - - pipenv run python gunicorn_config.py - - pipenv run test - -deploy: - tags: - - docker - - only: - - master - - services: - - docker:dind - - stage: deploy - script: - - sh scripts/deploy.sh - - environment: - name: Production - url: https://pythondiscord.com diff --git a/package.json b/package.json index 97a1988da..cbe35c4dd 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,10 @@ "devDependencies": {}, "repository": { "type": "git", - "url": "git@gitlab.com:discord-python/projects/site.git" + "url": "git@github.com:python-discord/projects/site.git" }, "homepage": "https://pythondiscord.com", - "bugs": "https://gitlab.com/python-discord/projects/site/issues", + "bugs": "https://github.com/python-discord/projects/site/issues", "author": "Python Discord", "license": "MIT" } diff --git a/pysite/views/error_handlers/http_4xx.py b/pysite/views/error_handlers/http_4xx.py index 731204f93..b6256490e 100644 --- a/pysite/views/error_handlers/http_4xx.py +++ b/pysite/views/error_handlers/http_4xx.py @@ -26,6 +26,6 @@ def error(self, error: HTTPException): return self.render( "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message=f"{error_desc} If you believe we have made a mistake, please " - "" - "open an issue on our GitLab." + "" + "open an issue on our GitHub." ), error.code diff --git a/pysite/views/error_handlers/http_5xx.py b/pysite/views/error_handlers/http_5xx.py index 489eb5e5d..bf96e35ac 100644 --- a/pysite/views/error_handlers/http_5xx.py +++ b/pysite/views/error_handlers/http_5xx.py @@ -36,6 +36,6 @@ def error(self, error: HTTPException): "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message="An error occurred while processing this request, please try " "again later. If you believe we have made a mistake, please " - "file an issue on our" - " GitLab." + "file an issue on our" + " GitHub." ), error.code diff --git a/pysite/views/main/redirects/github.py b/pysite/views/main/redirects/github.py index 9e9c0cb8e..259331ed9 100644 --- a/pysite/views/main/redirects/github.py +++ b/pysite/views/main/redirects/github.py @@ -4,5 +4,5 @@ class GitHubView(RedirectView): path = "/github" name = "github" - page = "https://gitlab.com/python-discord/" + page = "https://github.com/python-discord/" code = 302 diff --git a/pysite/views/main/redirects/gitlab.py b/pysite/views/main/redirects/gitlab.py index 4b2b60b48..2d4856bcb 100644 --- a/pysite/views/main/redirects/gitlab.py +++ b/pysite/views/main/redirects/gitlab.py @@ -4,5 +4,5 @@ class GitLabView(RedirectView): path = "/gitlab" name = "gitlab" - page = "https://gitlab.com/python-discord/" + page = "https://github.com/python-discord/" code = 302 diff --git a/templates/main/base.html b/templates/main/base.html index bb12fc9bd..b81be985e 100644 --- a/templates/main/base.html +++ b/templates/main/base.html @@ -42,7 +42,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitLab.
For privacy & GDPR-related info, please see this page.

diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 038ee5a22..87a08e7a3 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -201,7 +201,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitLab.
For privacy & GDPR-related info, please see this page.

From 0be194446e4e31359f28490cf1dca8b23427c2b1 Mon Sep 17 00:00:00 2001 From: Joseph Banks Date: Sat, 17 Nov 2018 21:23:45 +0000 Subject: [PATCH 02/11] Change all static content mentions of GitLab to GitHub --- pysite/views/error_handlers/http_4xx.py | 4 +- pysite/views/error_handlers/http_5xx.py | 4 +- templates/main/about/channels.html | 4 +- templates/main/base.html | 2 +- templates/main/info/faq.html | 51 ++----------------------- templates/main/info/help.html | 4 +- templates/main/info/resources.html | 8 ++-- templates/wiki/base.html | 2 +- 8 files changed, 17 insertions(+), 62 deletions(-) diff --git a/pysite/views/error_handlers/http_4xx.py b/pysite/views/error_handlers/http_4xx.py index 731204f93..a7aae6138 100644 --- a/pysite/views/error_handlers/http_4xx.py +++ b/pysite/views/error_handlers/http_4xx.py @@ -26,6 +26,6 @@ def error(self, error: HTTPException): return self.render( "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message=f"{error_desc} If you believe we have made a mistake, please " - "" - "open an issue on our GitLab." + "" + "open an issue on our GitHub." ), error.code diff --git a/pysite/views/error_handlers/http_5xx.py b/pysite/views/error_handlers/http_5xx.py index 489eb5e5d..6d4e6e457 100644 --- a/pysite/views/error_handlers/http_5xx.py +++ b/pysite/views/error_handlers/http_5xx.py @@ -36,6 +36,6 @@ def error(self, error: HTTPException): "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message="An error occurred while processing this request, please try " "again later. If you believe we have made a mistake, please " - "file an issue on our" - " GitLab." + "file an issue on our" + " GitHub." ), error.code diff --git a/templates/main/about/channels.html b/templates/main/about/channels.html index aed44b275..93a1538ac 100644 --- a/templates/main/about/channels.html +++ b/templates/main/about/channels.html @@ -71,7 +71,7 @@

Off-Topic

These channels are renamed daily by the server bot. Suggest funny channel names - on the dedicated GitLab meta issue. + on the dedicated GitHub meta issue.

Python Help

@@ -274,4 +274,4 @@

Voice

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/main/base.html b/templates/main/base.html index bb12fc9bd..be89b358e 100644 --- a/templates/main/base.html +++ b/templates/main/base.html @@ -42,7 +42,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitHub.
For privacy & GDPR-related info, please see this page.

diff --git a/templates/main/info/faq.html b/templates/main/info/faq.html index 67dcf15c7..74316ea75 100644 --- a/templates/main/info/faq.html +++ b/templates/main/info/faq.html @@ -19,8 +19,8 @@

These are some of the most-asked questions we get on a day-to-day basis. If you have a question, be sure to check this page and see if we've answered it already. If you'd like to - suggest an entry to this page, why not submit a merge request - on GitLab? + suggest an entry to this page, why not submit a pull request + on GitHub?

@@ -251,51 +251,6 @@

-
- Why did you move to GitLab? Do you hate Microsoft? -
-
-

- While many of our users do prefer to work on Linux, we don't hate Microsoft. While - - the news about Microsoft's acquisition of GitHub - - did prompt us to initially mirror our GitHub repositories to GitLab for safety, we didn't - outright make the move because of the acquisition - in fact, some of our staff members - had been suggesting we use it from the start! Here's some of the reasons we decided - to move: -

-
    -
  • - Prior to moving to GitLab, our development efforts were split among three services: - ClickUp for issue tracking, - GitHub for code storage and collaboration, - and Travis for continuous integration and testing. - GitLab is a fantastic alternative to all of these services, and moving to it has allowed - us to consolidate our efforts in one place. -
    • -
  • - For a long time now, GitLab has been innovating on features and pushing them to production - much faster than GitHub. Using GitLab gives us far more options when it comes to issue - management, merge requests, continuous integration and deployment - to name - a few things. -
    • -
  • - In the vast majority of cases where GitHub and GitLab solve the same problem or - have a similar feature, GitLab does it better. -
    • -
  • - GitLab has had free private repositories for some time now, and these are convenient - for us to store internal documentation and tasks in. -
    • -
  • - GitLab is fully open-source and quite easy to host yourself. In the event that the - public platform ends up dying or being abused by its staff, we can simply spin - up our own instance and keep on working as if there were no problems. -
    • -
-
-

Misc. Questions @@ -314,7 +269,7 @@

Python is a very versatile language, and a real-life application using it can take many forms. That said, we do plenty of Python development here ourselves. If you're curious about this question, then why not take a look at - our projects? + our projects?

diff --git a/templates/main/info/help.html b/templates/main/info/help.html index 9cc09af29..971671f9e 100644 --- a/templates/main/info/help.html +++ b/templates/main/info/help.html @@ -103,7 +103,7 @@

If you're still confused, try searching the Internet for people that have already had the same problem. Often, you won't be the only person to have encountered the issue you're dealing with - more often - than not, you'll find a GitLab ticket or a StackOverflow question along with a fix or answer to your + than not, you'll find a GitHub issue or a StackOverflow question along with a fix or answer to your question already posted.

@@ -458,4 +458,4 @@

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html index 574d0bfbf..51ea06c50 100644 --- a/templates/main/info/resources.html +++ b/templates/main/info/resources.html @@ -19,9 +19,9 @@

This page is intended to be a listing of useful resources for beginner and experienced Python programmers alike. This page is generated from a JSON file - on GitLab - + on GitHub - if there's a great resource that you love and you don't see it on this page, feel free to submit a - merge request! + pull request!

Some resources aren't free - the below key will help you figure out whether you need to pay for @@ -83,7 +83,7 @@

{{ item }}
- {% for url in data.urls %} + g {% for url in data.urls %} @@ -100,4 +100,4 @@

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 038ee5a22..0b7cb8f70 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -201,7 +201,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitHub.
For privacy & GDPR-related info, please see this page.

From 617864c978bae4d4487fc3a1e4b09212bf27e941 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:27:06 +0100 Subject: [PATCH 03/11] Update templates/main/base.html Co-Authored-By: heavysaturn --- templates/main/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/base.html b/templates/main/base.html index b81be985e..be89b358e 100644 --- a/templates/main/base.html +++ b/templates/main/base.html @@ -42,7 +42,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitHub.
For privacy & GDPR-related info, please see this page.

From 6baf3ccf1c8c4d42274fdc78a0549035ff78dc54 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:27:49 +0100 Subject: [PATCH 04/11] Update package.json Co-Authored-By: heavysaturn --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09689918f..304f9c83a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "url": "git@github.com:python-discord/projects/site.git" }, "homepage": "https://pythondiscord.com", - "bugs": "https://github.com/python-discord/projects/site/issues", + "bugs": "https://github.com/python-discord/site/issues", "author": "Python Discord", "license": "MIT" } From fa1f159f27ed9065462481f93143d4f52856c1f1 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:27:56 +0100 Subject: [PATCH 05/11] Update package.json Co-Authored-By: heavysaturn --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 304f9c83a..7bf9d9848 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "devDependencies": {}, "repository": { "type": "git", - "url": "git@github.com:python-discord/projects/site.git" + "url": "git@github.com:python-discord/site.git" }, "homepage": "https://pythondiscord.com", "bugs": "https://github.com/python-discord/site/issues", From dad32c388dd37f58c61e1a9c6575f7e2828558ac Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:28:07 +0100 Subject: [PATCH 06/11] Update templates/wiki/base.html Co-Authored-By: heavysaturn --- templates/wiki/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 87a08e7a3..0b7cb8f70 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -201,7 +201,7 @@

This website uses Python and Flask, and was developed collaboratively on - GitLab. + GitHub.
For privacy & GDPR-related info, please see this page.

From 5ab3e9177afc8a0ade5e96a105f42daf1cc5daf3 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:28:32 +0100 Subject: [PATCH 07/11] Update pysite/views/error_handlers/http_5xx.py Co-Authored-By: heavysaturn --- pysite/views/error_handlers/http_5xx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysite/views/error_handlers/http_5xx.py b/pysite/views/error_handlers/http_5xx.py index bf96e35ac..6d4e6e457 100644 --- a/pysite/views/error_handlers/http_5xx.py +++ b/pysite/views/error_handlers/http_5xx.py @@ -36,6 +36,6 @@ def error(self, error: HTTPException): "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message="An error occurred while processing this request, please try " "again later. If you believe we have made a mistake, please " - "file an issue on our" + "file an issue on our" " GitHub." ), error.code From 68243332c9a7590724df4d206f158e468b467b51 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 2 Dec 2018 21:29:30 +0100 Subject: [PATCH 08/11] Update pysite/views/error_handlers/http_4xx.py Co-Authored-By: heavysaturn --- pysite/views/error_handlers/http_4xx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysite/views/error_handlers/http_4xx.py b/pysite/views/error_handlers/http_4xx.py index b6256490e..a7aae6138 100644 --- a/pysite/views/error_handlers/http_4xx.py +++ b/pysite/views/error_handlers/http_4xx.py @@ -26,6 +26,6 @@ def error(self, error: HTTPException): return self.render( "errors/error.html", code=error.code, req=request, error_title=error_desc, error_message=f"{error_desc} If you believe we have made a mistake, please " - "" + "" "open an issue on our GitHub." ), error.code From f402a3c08b31491a8852c56e30ca73a5da8286df Mon Sep 17 00:00:00 2001 From: Joseph Banks Date: Mon, 3 Dec 2018 19:43:28 +0000 Subject: [PATCH 09/11] Remove an unintentional g --- templates/main/info/resources.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html index 51ea06c50..bc914aa25 100644 --- a/templates/main/info/resources.html +++ b/templates/main/info/resources.html @@ -83,7 +83,7 @@

{{ item }}
- g {% for url in data.urls %} + {% for url in data.urls %} From d4b4b6b0171333b2f1a918e89d6a46262c30360f Mon Sep 17 00:00:00 2001 From: Joseph Banks Date: Mon, 3 Dec 2018 19:47:45 +0000 Subject: [PATCH 10/11] Replace link to raw resources.json file with the resources.json inside the repository --- templates/main/info/resources.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html index bc914aa25..9a78b7bcb 100644 --- a/templates/main/info/resources.html +++ b/templates/main/info/resources.html @@ -19,7 +19,7 @@

This page is intended to be a listing of useful resources for beginner and experienced Python programmers alike. This page is generated from a JSON file - on GitHub - + on GitHub - if there's a great resource that you love and you don't see it on this page, feel free to submit a pull request!

From 7c2c11b61a0322b98c0158d5f1beb7c92567280a Mon Sep 17 00:00:00 2001 From: Joseph Banks Date: Thu, 3 Jan 2019 00:25:57 +0000 Subject: [PATCH 11/11] Remove references to GitLab email-in issues from privacy.html --- templates/main/about/privacy.html | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/templates/main/about/privacy.html b/templates/main/about/privacy.html index 51817e7d1..a9f726f6a 100644 --- a/templates/main/about/privacy.html +++ b/templates/main/about/privacy.html @@ -115,24 +115,9 @@

Data collection

Used to verify that you have a working environment Administrative staff - - - Email Address - Issues emailed directly to GitLab - Used to keep track of issue submissions - GitLab staff - never stored in our database - -

- Note that we don't ordinarily collect your email address, and your email address will never be - stored on our servers. The only time it will be shown is in the title of any issues you create on - GitLab by directly emailing us on the meta@ email address. These issues are confidential, - not associated with a user account, do not require a GitLab account, and will only ever be seen by - staff. -

-

Collecting consent