Merge pull request python-discord#90 from python-discord/gitlab_to_gi…

…thub Replaced most references to GitLab with GitHub.
killme-png · Jan 3, 2019 · 206b226 · 206b226
2 parents 67c80d2 + c81d7f8
commit 206b226
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 157 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/package.json b/package.json
@@ -16,10 +16,10 @@
   "devDependencies": {},
   "repository": {
     "type": "git",
-    "url": "git@gitlab.com:discord-python/projects/site.git"
+    "url": "git@github.com:python-discord/site.git"
   },
   "homepage": "https://pythondiscord.com",
-  "bugs": "https://gitlab.com/python-discord/projects/site/issues",
+  "bugs": "https://github.com/python-discord/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
@@ -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 "
-                          "<a href='https://gitlab.com/python-discord/projects/site/issues'>"
-                          "open an issue on our GitLab</a>."
+                          "<a href='https://github.com/python-discord/site/issues'>"
+                          "open an issue on our GitHub</a>."
         ), error.code
diff --git 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 "
-                          "<a href='https://gitlab.com/python-discord/projects/site/issues'>file an issue on our"
-                          " GitLab</a>."
+                          "<a href='https://github.com/python-discord/site/issues'>file an issue on our"
+                          " GitHub</a>."
         ), error.code
diff --git 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
@@ -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/about/channels.html b/templates/main/about/channels.html
@@ -70,7 +70,7 @@ <h2>Off-Topic</h2>
 
                 <p>
                     These channels are renamed daily by the server bot. Suggest funny channel names
-                    <a href="https://gitlab.com/python-discord/meta/issues/8">on the dedicated GitLab meta issue</a>.
+                    <a href="https://github.com/python-discord/meta/issues/8">on the dedicated GitHub meta issue</a>.
                 </p>
 
                 <h2>Python Help</h2>
@@ -292,4 +292,4 @@ <h2>Voice</h2>
             </article>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/templates/main/about/privacy.html b/templates/main/about/privacy.html
@@ -115,24 +115,9 @@ <h3>Data collection</h3>
                             <td>Used to verify that you have a working environment</td>
                             <td>Administrative staff</td>
                         </tr>
-
-                        <tr>
-                            <td>Email Address</td>
-                            <td class="uk-table-shrink">Issues emailed directly to GitLab</td>
-                            <td>Used to keep track of issue submissions</td>
-                            <td>GitLab staff - never stored in our database</td>
-                        </tr>
                     </tbody>
                 </table>
 
-                <p>
-                    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 <code>meta@</code> 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.
-                </p>
-
                 <h1 class="uk-article-title hover-title" id="consent">
                     Collecting consent
 

diff --git a/templates/main/base.html b/templates/main/base.html
@@ -42,7 +42,7 @@
                     <p>
                         This website uses <a href="https://python.org">Python</a> and
                         <a href="http://flask.pocoo.org/">Flask</a>, and was developed collaboratively on
-                        <a href="https://gitlab.com/python-discord/projects/site">GitLab</a>.
+                        <a href="https://github.com/python-discord/site">GitHub</a>.
                         <br />
                         For privacy &amp; GDPR-related info, please <a href="{{ url_for("main.about.privacy") }}">see this page</a>.
                     </p>

diff --git a/templates/main/info/faq.html b/templates/main/info/faq.html
@@ -19,8 +19,8 @@ <h1 class="uk-article-title hover-title" id="top">
                 <p>
                     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
-                    <a href="https://gitlab.com/python-discord/projects/site">on GitLab</a>?
+                    suggest an entry to this page, why not submit a pull request
+                    <a href="https://github.com/python-discord/site">on GitHub</a>?
                 </p>
 
                 <div uk-grid class="uk-grid uk-grid-match">
@@ -251,51 +251,6 @@ <h2 class="uk-heading-divider" id="community">
                         </h2>
                     </div>
 
-                    <div class="uk-width-1-3@m">
-                        <strong>Why did you move to GitLab? Do you hate Microsoft?</strong>
-                    </div>
-                    <div class="uk-width-2-3@m">
-                        <p>
-                            While many of our users do prefer to work on Linux, we don't hate Microsoft. While
-                            <a href="https://www.theregister.co.uk/2018/06/04/microsoft_buys_github/">
-                                the news about Microsoft's acquisition of GitHub
-                            </a>
-                            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:
-                        </p>
-                        <ul>
-                            <li>
-                                Prior to moving to GitLab, our development efforts were split among three services:
-                                <a href="https://clickup.com/">ClickUp</a> for issue tracking,
-                                <a href="https://github.com/">GitHub</a> for code storage and collaboration,
-                                and <a href="https://clickup.com/">Travis</a> 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.
-                            </li>
-                            <li>
-                                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.
-                            </li>
-                            <li>
-                                In the vast majority of cases where GitHub and GitLab solve the same problem or
-                                have a similar feature, GitLab does it better.
-                            </li>
-                            <li>
-                                GitLab has had free private repositories for some time now, and these are convenient
-                                for us to store internal documentation and tasks in.
-                            </li>
-                            <li>
-                                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.
-                            </li>
-                        </ul>
-                    </div>
-
                     <div class="uk-width-1-1@s">
                         <h2 class="uk-heading-divider" id="misc">
                             Misc. Questions
@@ -314,7 +269,7 @@ <h2 class="uk-heading-divider" id="misc">
                             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
-                            <a href="https://gitlab.com/python-discord">our projects</a>?
+                            <a href="https://github.com/python-discord">our projects</a>?
                         </p>
                     </div>
                 </div>

diff --git a/templates/main/info/help.html b/templates/main/info/help.html
@@ -104,7 +104,7 @@ <h2 class="uk-article-title hover-title" id="before">
                 <p>
                     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.
                 </p>
                 <p>

diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html
@@ -19,9 +19,9 @@ <h1 class="uk-article-title hover-title" id="top">
                 <p>
                     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
-                    <a href="https://gitlab.com/python-discord/projects/site/blob/master/static/resources.json">on GitLab</a> -
+                    <a href="https://github.com/python-discord/site/blob/master/static/resources.json">on GitHub</a> -
                     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!
                 </p>
                 <p>
                     Some resources aren't free - the below key will help you figure out whether you need to pay for
@@ -100,4 +100,4 @@ <h2 class="uk-heading-divider hover-title" id="{{ category_name.replace(" ", "-"
             </article>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/templates/wiki/base.html b/templates/wiki/base.html
@@ -201,7 +201,7 @@
                     <p>
                         This website uses <a href="https://python.org">Python</a> and
                         <a href="http://flask.pocoo.org/">Flask</a>, and was developed collaboratively on
-                        <a href="https://gitlab.com/python-discord/projects/site">GitLab</a>.
+                        <a href="https://github.com/python-discord/site">GitHub</a>.
                         <br />
                         For privacy &amp; GDPR-related info, please <a href="{{ url_for("main.about.privacy") }}">see this page</a>.
                     </p>