Repository: readthedocs/readthedocs.org
Issue: Link to GitHub include 'origin' and thus are broken

## Details
I'm facing the same problem as mentioned in #3203 
That issue is closed.

* Read the Docs project URL: http://datastandard.globalcoffeeplatform.org
* Build URL (if applicable): https://readthedocs.org/api/v2/build/8790271.txt
* Read the Docs username (if applicable):

## Expected Result
I expect the 'Edit on GitHub' to be
https://github.com/globalcoffeeplatform/CoffeeDataStandard/blob/master/docs/source/index.rst
Without the 'origin' part.
*A description of what you wanted to happen*

## Actual Result
Now the link is 
https://github.com/globalcoffeeplatform/CoffeeDataStandard/blob/origin/master/docs/source/index.rst

*A description of what actually happened*
I've rebuild several times. Perhaps I need a different version of some tool?
I'm using Spinx v1.8.4 and sphinx-rtd-theme v0.4.2

Changed files:
readthedocs/projects/forms.py, readthedocs/rtd_tests/tests/test_project_forms.py

diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py
index 21e567f27..e5e32d06d 100644
--- a/readthedocs/projects/forms.py
+++ b/readthedocs/projects/forms.py
@@ -241,12 +241,14 @@ class ProjectAdvancedForm(ProjectTriggerBuildMixin, ProjectForm):
         )
 
         default_choice = (None, '-' * 9)
-        all_versions = self.instance.versions.values_list(
-            'identifier',
-            'verbose_name',
-        )
+        # commit_name is used as the id because it handles
+        # the special cases of LATEST and STABLE.
+        all_versions_choices = [
+            (v.commit_name, v.verbose_name)
+            for v in self.instance.versions.all()
+        ]
         self.fields['default_branch'].widget = forms.Select(
-            choices=[default_choice] + list(all_versions),
+            choices=[default_choice] + all_versions_choices,
         )
 
         active_versions = self.get_all_active_versions()
diff --git a/readthedocs/rtd_tests/tests/test_project_forms.py b/readthedocs/rtd_tests/tests/test_project_forms.py
index e762e4e23..f8603ef81 100644
--- a/readthedocs/rtd_tests/tests/test_project_forms.py
+++ b/readthedocs/rtd_tests/tests/test_project_forms.py
@@ -16,6 +16,7 @@ from readthedocs.projects.constants import (
 )
 from readthedocs.projects.exceptions import ProjectSpamError
 from readthedocs.projects.forms import (
+    EmailHookForm,
     EnvironmentVariableForm,
     ProjectAdvancedForm,
     ProjectBasicsForm,
@@ -23,7 +24,6 @@ from readthedocs.projects.forms import (
     TranslationForm,
     UpdateProjectForm,
     WebHookForm,
-    EmailHookForm
 )
 from readthedocs.projects.models import EnvironmentVariable, Project
 
@@ -201,6 +201,7 @@ class TestProjectAdvancedForm(TestCase):
             active=True,
             privacy_level=PUBLIC,
             identifier='public-1',
+            verbose_name='public-1',
         )
         get(
             Version,
@@ -209,6 +210,7 @@ class TestProjectAdvancedForm(TestCase):
             active=True,
             privacy_level=PUBLIC,
             identifier='public-2',
+            verbose_name='public-2',
         )
         get(
             Version,
@@ -217,6 +219,7 @@ class TestProjectAdvancedForm(TestCase):
             active=False,
             privacy_level=PROTECTED,
             identifier='public-3',
+            verbose_name='public-3',
         )
         get(
             Version,
@@ -225,6 +228,7 @@ class TestProjectAdvancedForm(TestCase):
             active=False,
             privacy_level=PUBLIC,
             identifier='public/4',
+            verbose_name='public/4',
         )
         get(
             Version,
@@ -233,6 +237,7 @@ class TestProjectAdvancedForm(TestCase):
             active=True,
             privacy_level=PRIVATE,
             identifier='private',
+            verbose_name='private',
         )
         get(
             Version,
@@ -241,6 +246,7 @@ class TestProjectAdvancedForm(TestCase):
             active=True,
             privacy_level=PROTECTED,
             identifier='protected',
+            verbose_name='protected',
         )
 
     def test_list_only_active_versions_on_default_version(self):