Ubuntu Developer Portal

Merge lp:~dholbach/developer-ubuntu-com/more-and-faster-imports into lp:developer-ubuntu-com

  1. more-and-faster-imports
  2. Merge into stable
Proposed by Daniel Holbach on 2016-04-27
Status: Merged
Approved by: David Callé on 2016-04-29
Approved revision: 218
Merged at revision: 216
Proposed branch: lp:~dholbach/developer-ubuntu-com/more-and-faster-imports
Merge into: lp:developer-ubuntu-com
Diff against target: 35 lines (+2/-3)
3 files modified
Makefile (+1/-1)
md_importer/importer/__init__.py (+1/-0)
md_importer/importer/process.py (+0/-2)
To merge this branch: bzr merge lp:~dholbach/developer-ubuntu-com/more-and-faster-imports
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers 2016-04-27 Pending
Review via email: mp+293137@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-04-22 14:06:59 +0000
3+++ Makefile 2016-04-29 10:01:51 +0000
4@@ -35,7 +35,7 @@
5 @echo internal_proxy=\"${internal_proxy}\" >> crontab
6 @echo "0 4 * * * cd ${PWD}; ./update_apidocs.sh > ${PWD}/../../logs/update_apidocs.log 2>${PWD}/../../logs/update_apidocs_errors.log" >> crontab
7 @echo "15 4 * * * cd ${PWD}; ${PYTHON} manage.py update-gadget-snaps > ${PWD}/../../logs/update_gadgetsnaps.log 2>${PWD}/../../logs/update_gadgetsnaps_errors.log" >> crontab
8- @echo "20 4 * * * cd ${PWD}; ${PYTHON} manage.py import_md > ${PWD}/../../logs/import_md.log 2>${PWD}/../../logs/import_md.log" >> crontab
9+ @echo "20 */6 * * * cd ${PWD}; ${PYTHON} manage.py import_md > ${PWD}/../../logs/import_md.log 2>${PWD}/../../logs/import_md.log" >> crontab
10 @crontab ./crontab
11 @rm ./crontab
12
13
14=== modified file 'md_importer/importer/__init__.py'
15--- md_importer/importer/__init__.py 2016-04-21 12:26:42 +0000
16+++ md_importer/importer/__init__.py 2016-04-29 10:01:51 +0000
17@@ -12,6 +12,7 @@
18 # Instead of just using pymdownx.github, we go with these because of
19 # https://github.com/facelessuser/pymdown-extensions/issues/11
20 MARKDOWN_EXTENSIONS = [
21+ 'markdown.extensions.footnotes',
22 'markdown.extensions.tables',
23 'pymdownx.magiclink',
24 'pymdownx.betterem',
25
26=== modified file 'md_importer/importer/process.py'
27--- md_importer/importer/process.py 2016-04-21 12:26:42 +0000
28+++ md_importer/importer/process.py 2016-04-29 10:01:51 +0000
29@@ -63,6 +63,4 @@
30 branch=branch).filter(id__in=imported_page_ids).delete()
31 shutil.rmtree(tempdir)
32
33- # https://stackoverflow.com/questions/33284171/
34- call_command('cms', 'fix-tree')
35 return repo

Subscribers

People subscribed via source and target branches