Skip to content

Commit ab9c81c

Browse files
ericholscherericholscher
authored
Merge branch 'master' into master
2 parents 6c1567d + 40ece34 commit ab9c81c

File tree

488 files changed

+17117
-10400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+17117
-10400
lines changed

‎.coveragerc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[run]
2+
omit =
3+
*/**/migrations/*

‎.eslintrc‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
common/eslintrc

‎.flake8‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.flake8‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
common/flake8

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*.jpg binary
99
*.otf binary
1010
*.png binary
11+
*.eot binary
1112
*.ttf binary
1213
*.whl binary
1314
*.woff binary
15+
*.woff2 binary

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Details
22

3-
* Project URL:
3+
* Read the Docs project URL:
44
* Build URL (if applicable):
5-
* Read the Docs username (if applicable):
5+
* Read the Docs username (if applicable):
66

77
## Expected Result
88

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
_build
1717
bower_components/
1818
contrib/supervisord.log
19+
contrib/supervisord.pid
20+
celerybeat-schedule.*
1921
deploy/.vagrant
2022
dist/*
2123
local_settings.py
@@ -30,6 +32,7 @@ media/man
3032
media/pdf
3133
media/static
3234
node_modules
35+
package-lock.json
3336
readthedocs/rtd_tests/builds
3437
readthedocs/rtd_tests/tests/builds
3538
user_builds
@@ -45,6 +48,8 @@ readthedocs/htmlcov
4548
tags
4649
.python-version
4750
*.pyo
51+
.pytest_cache/
52+
scripts/travis/elasticsearch*
4853

4954
# Environments
5055
.env

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "common"]
2+
path = common
3+
url = https://github.com/rtfd/common.git

‎.isort.cfg‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)