Skip to content

GitHub App: open beta #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 29, 2025
Merged

GitHub App: open beta #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51cb4a8
GitHub App: open beta
stsewd May 28, 2025
4fd5d46
Updates from review
stsewd May 29, 2025
db5c637
Disable the whole page
stsewd May 29, 2025
c52c445
Merge branch 'main' into gh-app-open-beta
stsewd May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readthedocsext/theme/templates/profiles/partials/github_oauth_disconnect_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
action="{% url 'socialaccount_connections' %}">
{% csrf_token %}
<input type="hidden" name="account" value="{{ object.id }}" />
<button class="ui button" type="submit">
<button class="ui disabled button" type="submit">
<i class="fa-brands fa-github icon"></i>
{% trans "Disconnect" %}
</button>
Expand Down
2 changes: 1 addition & 1 deletion readthedocsext/theme/templates/profiles/partials/github_oauth_revoke_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{% else %}
<a href="{{ old_application_link }}"
target="_blank"
class="ui button"
class="ui disabled button"
data-bind="click: trackLinkClick">
<i class="fa-brands fa-github icon"></i>
{% trans "Revoke" %}
Expand Down
68 changes: 43 additions & 25 deletions readthedocsext/theme/templates/profiles/private/migrate_to_gh_app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,44 +217,62 @@ <h3 class="ui small header">{% trans "Migrate all projects" %}</h3>

<a class="ui button" href="?step=revoke">{% trans "Next" %}</a>
{% elif step == "revoke" %}
<p>
<div class="ui small warning message">
<i class="fad fa-warning icon"></i>
{% blocktrans trimmed %}
Revoke access to our old GitHub OAuth app.
You'll be redirected to GitHub, where you need to click on "Revoke access".
During the beta period, we don't recommend revoking access to our old GitHub OAuth app.
You will be reminded to complete this step after the beta period ends.
{% endblocktrans %}
</p>

{% if has_projects_pending_migration and not step_revoke_completed %}
<div class="ui small warning message">
<i class="fad fa-warning icon"></i>
{% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
You have projects that need to be <a href="{{ migrate_step }}">migrated</a>.
If you revoke access now, you'll need to <a href="{{ manual_migration_docs }}">manually migrate</a> them.
</div>
<div class="ui disabled basic segment">
<p>
{% blocktrans trimmed %}
Revoke access to our old GitHub OAuth app.
You'll be redirected to GitHub, where you need to click on "Revoke access".
{% endblocktrans %}
</div>
{% endif %}
</p>

{% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %}
{% if has_projects_pending_migration and not step_revoke_completed %}
<div class="ui small warning message">
<i class="fad fa-warning icon"></i>
{% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
You have projects that need to be <a href="{{ migrate_step }}">migrated</a>.
If you revoke access now, you'll need to <a href="{{ manual_migration_docs }}">manually migrate</a> them.
{% endblocktrans %}
</div>
{% endif %}

{% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %}
</div>

<div class="ui divider"></div>
<a class="ui button {% if not step_revoke_completed %}disabled{% endif %}"
href="?step=disconnect">{% trans "Next" %}</a>
{% elif step == "disconnect" %}
<p>
<div class="ui small warning message">
<i class="fad fa-warning icon"></i>
{% blocktrans trimmed %}
Disconnect the old GitHub OAuth app from your Read the Docs account.
{% endblocktrans %}
</p>

<div class="ui message info">
<i class="fad fa-info-circle icon"></i>
{% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
After disconnecting the old GitHub OAuth app, you won't be able to see this page again.
If you have projects that need to be migrated, you'll need to <a href="{{ manual_migration_docs }}">manually migrate</a> them.
During the beta period, we don't recommend disconnecting your account from our old GitHub OAuth app.
You will be reminded to complete this step after the beta period ends.
{% endblocktrans %}
</div>
<div class="ui disabled basic segment">
<p>
{% blocktrans trimmed %}
Disconnect the old GitHub OAuth app from your Read the Docs account.
{% endblocktrans %}
</p>

{% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %}
<div class="ui message info">
<i class="fad fa-info-circle icon"></i>
{% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
After disconnecting the old GitHub OAuth app, you won't be able to see this page again.
If you have projects that need to be migrated, you'll need to <a href="{{ manual_migration_docs }}">manually migrate</a> them.
{% endblocktrans %}
</div>

{% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %}
</div>
{% endif %}
</div>
</div>
Expand Down