diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 02:41:01 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 02:41:01 +0800 |
commit | 6a00cf1b9da3bc8bb1a9a270defd154bf7c93580 (patch) | |
tree | e82ee2a2bc25249f1a0f1a52344f277f87c3c010 /vendor/gitignore/Python.gitignore | |
parent | f3c3d8e63ba078e55c0ce516e19ec11cea429e43 (diff) | |
parent | 3ac3106e585273b1d9c673c71f794ae018698f83 (diff) | |
download | gitlab-ce-6a00cf1b9da3bc8bb1a9a270defd154bf7c93580.tar.gz |
Merge remote-tracking branch 'upstream/master' into show-status-from-branch
* upstream/master: (74 commits)
Clarify the author field for the changelog documentation
Add and update .gitignore & .gitlab-ci.yml templates for 8.14
Update "Installation from source" guide for 8.14.0
Add CHANGELOG entries for latest patches
Merge branch 'fix/import-export-symlink-vulnerability' into 'security'
Merge branch 'fix/import-projectmember-security' into 'security'
Use stubs instead of modifying global states
Add changelog instructions to CHANGELOG.md
Try not to include anything globally!
Update help banner for bin/changelog
Add a `--force` option to bin/changelog
Update examples in changelog docs to use single quotes around title
Use the server's base URL without relative URL part when creating links in JIRA
Update docs and test description
Update docs and unexpose token
Make ESLint ignore instrumented files for coverage analysis (!7236)
Initialize form validation on new group form.
Check that JavaScript file names match convention (!7238)
Unchange username_validator.
Move snake_case to camelCase.
...
Diffstat (limited to 'vendor/gitignore/Python.gitignore')
-rw-r--r-- | vendor/gitignore/Python.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore index 37fc9d40817..6a2bf47ade9 100644 --- a/vendor/gitignore/Python.gitignore +++ b/vendor/gitignore/Python.gitignore @@ -66,7 +66,7 @@ docs/_build/ # PyBuilder target/ -# IPython Notebook +# Jupyter Notebook .ipynb_checkpoints # pyenv |