Ubuntu Apps Directory

Merge lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults into lp:ubuntu-webcatalog

  1. tos-sane-defaults
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 192
Merged at revision: 192
Proposed branch: lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults
Merge into: lp:ubuntu-webcatalog
Diff against target: 29 lines (+4/-4)
2 files modified
django_project/config/main.cfg (+0/-2)
src/webcatalog/schema.py (+4/-2)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults
Reviewer Review Type Date Requested Status
Michael Nelson (community) Approve
Review via email: mp+190313@code.launchpad.net

Commit message

moving u1 terms urls from config into schema as sane defaults

Description of the change

moving u1 terms urls from config into schema as sane defaults

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg 2013-09-04 20:28:43 +0000
+++ django_project/config/main.cfg 2013-10-10 08:54:21 +0000
@@ -93,8 +93,6 @@
93convoy_root = ./src/webcatalog/static/93convoy_root = ./src/webcatalog/static/
94ubuntu_series_for_versions = series_for_versions94ubuntu_series_for_versions = series_for_versions
95webapp_log_path = ./tmp/webapp.log95webapp_log_path = ./tmp/webapp.log
96ubuntuone_tos_url = http://one.ubuntu.com/terms/
97ubuntuone_tos_url_embedded = http://one.ubuntu.com/terms/embedded
9896
99[series_for_versions]97[series_for_versions]
10010.04 = lucid9810.04 = lucid
10199
=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py 2013-09-04 20:28:43 +0000
+++ src/webcatalog/schema.py 2013-10-10 08:54:21 +0000
@@ -79,8 +79,10 @@
79 default='./tmp/webapp.log')79 default='./tmp/webapp.log')
80 log_format = schema.StringOption(80 log_format = schema.StringOption(
81 default='%(asctime)s - %(name)s - %(levelname)s - %(message)s')81 default='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
82 ubuntuone_tos_url = schema.StringOption()82 ubuntuone_tos_url = schema.StringOption(
83 ubuntuone_tos_url_embedded = schema.StringOption()83 default='http://one.ubuntu.com/terms/')
84 ubuntuone_tos_url_embedded = schema.StringOption(
85 default='http://one.ubuntu.com/terms/embedded/')
8486
85 class google(schema.Section):87 class google(schema.Section):
86 google_analytics_id = schema.StringOption()88 google_analytics_id = schema.StringOption()

Subscribers

People subscribed via source and target branches