Skip to content

Change default branch name from 'master' to 'main' for GitHub imports… #76

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

Open
KiserDesigns wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change default branch name from 'master' to 'main' for GitHub imports… #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cloudpebble/ide/static/ide/js/github.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ CloudPebble.GitHub = (function() {
var hook_force = pane.find('#github-repo-hook-force').is(':checked');

if(repo_branch == null || repo_branch.length == 0) {
repo_branch = "master";
repo_branch = "main";
}

if((new_repo === CloudPebble.ProjectInfo.github.repo || !new_repo && !CloudPebble.ProjectInfo.github.repo) &&
Expand Down
2 changes: 1 addition & 1 deletion cloudpebble/ide/static/ide/js/project_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ $(function() {
return;
}
if(branch.length == 0) {
branch = 'master';
branch = 'main';
}
disable_import_controls();
active_set.find('.progress').removeClass('hide');
Expand Down
2 changes: 1 addition & 1 deletion cloudpebble/ide/templates/ide/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ <h3>{% trans "Import Existing Project" %}</h3>
<div class="control-group">
<label class="control-label" for="import-github-branch">{% trans "Branch (optional)" %}</label>
<div class="controls">
<input type="text" id="import-github-branch" placeholder="master" />
<input type="text" id="import-github-branch" placeholder="main" />
</div>
</div>
{% if user.github_repo_sync %}
Expand Down
2 changes: 1 addition & 1 deletion cloudpebble/ide/templates/ide/project/github.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="control-group">
<label class="control-label" for="github-branch">{% trans 'Branch' context "git branch" %}</label>
<div class="controls">
<input type="text" class="span6" id="github-branch" placeholder="master" />
<input type="text" class="span6" id="github-branch" placeholder="main" />
</div>
</div>
<div class="control-group">
Expand Down
2 changes: 1 addition & 1 deletion cloudpebble/ide/tests/test_project_import_api.skip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TestProjectImportApi(TestCase):
response = self.client.post('/ide/import/github', {
'name': 'github-import',
'repo': 'github.com/example/repo',
'branch': 'master',
'branch': 'main',
'add_remote': 'false',
})
payload = json.loads(response.content)
Expand Down
Loading