Skip to content
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

Jump to bottom

Remove overwrite of project's gitignore #11453

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Remove overwrite of project's gitignore #11453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2160b
Update release notes with .gitignore changes
chiatt Sep 11, 2024
7f066ab
Don't overwrite a project's gitignore
chiatt Sep 11, 2024
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
4 changes: 1 addition & 3 deletions arches/management/commands/updateproject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def handle(self, *args, **options):
answer = input(
"This will replace the following files in your project:\n"
".babelrc, eslintrc.js, .eslintignore, .browserslistrc, .stylelintrc.json,\n"
".yarnrc, .gitattributes, .gitignore, nodemon.json, .prettierrc,\n"
".yarnrc, .gitattributes, nodemon.json, .prettierrc,\n"
".pre-commit-config.yaml, tsconfig.json, and the entire webpack directory.\n\n"
"Continue? "
)
Expand Down Expand Up @@ -137,7 +137,6 @@ def update_to_v7_6(self):
"tsconfig.json",
".coveragerc",
".gitattributes",
".gitignore",
".babelrc",
".browserslistrc",
".stylelintrc.json",
Expand Down Expand Up @@ -384,7 +383,6 @@ def update_to_v7_6(self):
for relative_file_path in [
os.path.join("..", "gettext.config.js"),
os.path.join("..", ".coveragerc"),
os.path.join("..", ".gitignore"),
os.path.join("..", ".github/workflows/main.yml"),
os.path.join("..", ".pre-commit-config.yaml"),
os.path.join("..", "tsconfig.json"),
Expand Down
14 changes: 11 additions & 3 deletions releases/7.6.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,17 @@ Minor incompatibilities:
```

9. Update `.gitignore`:
1. Change `${project_name}/media/node_modules` to `node_modules`
2. Change `${project_name}/webpack/webpack-stats.json` to `webpack/webpack-stats.json`
3. If it exists, remove `${project_name}/webpack/webpack-user-config.js`
1. Change `{project_name}/media/node_modules` to `node_modules`
2. Change `{project_name}/webpack/webpack-stats.json` to `webpack/webpack-stats.json`
3. If it exists, remove `{project_name}/webpack/webpack-user-config.js`
4. Add the following:
```
*.egg-info
.DS_STORE
.tsconfig-paths.json
.frontend-configuration-settings.json
coverage/
```

10. In settings.py:
1. In `INSTALLED_APPS`:
Expand Down
Loading