Skip to content

Commit

Permalink
Move assets/ to live under static/.
Browse files Browse the repository at this point in the history
This decreases the clutter in the root directory of the Zulip
repository.
  • Loading branch information
timabbott committed Aug 26, 2016
1 parent d8aed02 commit b200c6c
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.gitignore export-ignore
.gitattributes export-ignore
/analytics export-ignore
/assets export-ignore
/static/assets export-ignore
/bots export-ignore
/corporate export-ignore
/static export-ignore
Expand Down
4 changes: 2 additions & 2 deletions docs/directory-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ templating systems.

* `node_modules/` Third-party JavaScript installed via `npm`.

* `assets/` For assets not to be served to the web (e.g. the system to
generate our favicons).
* `static/assets/` For assets not to be served to the web (e.g. the system to
generate our favicons).

-----------------------------------------------------------------------

Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
2 changes: 1 addition & 1 deletion tools/setup/emoji_dump/build_emoji
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ rm -rf static/third/gemoji/images
(cd tools/setup/emoji_dump && python ./emoji_dump.py)
mkdir -p static/third/gemoji/images
mv tools/setup/emoji_dump/out static/third/gemoji/images/emoji
cp -RPp assets/zulip-emoji/* static/third/gemoji/images/emoji/
cp -RPp static/assets/zulip-emoji/* static/third/gemoji/images/emoji/
2 changes: 1 addition & 1 deletion tools/update-prod-static
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ subprocess.check_call(['bash', '-ex', 'tools/setup/download-zxcvbn'],
stdout=fp, stderr=fp)

# Collect the files that we're going to serve.
subprocess.check_call(['python', './manage.py', 'collectstatic', '--noinput'],
subprocess.check_call(['python', './manage.py', 'collectstatic', '--noinput', '-i', 'assets'],
stdout=fp, stderr=fp)

# Compile translation strings to generate `.mo` files.
Expand Down

0 comments on commit b200c6c

Please sign in to comment.