author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
commit | db8b8cb9467625cb8d9ecb67863aa67590e59cc0 (patch) (unidiff) | |
tree | d27644fc1b98ec6365e74f3ba40c19f78f8a287f /cgit.c | |
parent | db6303b58883c4417f5bcc0c1ee34fed6553dca3 (diff) | |
parent | 537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (diff) | |
download | cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.zip cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.gz cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.bz2 |
Merge branch 'lh/about'
Conflicts:
cgit.h
-rw-r--r-- | cgit.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -100,6 +100,8 @@ void config_cb(const char *name, const char *value) | |||
100 | ctx.cfg.cache_static_ttl = atoi(value); | 100 | ctx.cfg.cache_static_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-dynamic-ttl")) | 101 | else if (!strcmp(name, "cache-dynamic-ttl")) |
102 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 102 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
103 | else if (!strcmp(name, "about-filter")) | ||
104 | ctx.cfg.about_filter = new_filter(value, 0); | ||
103 | else if (!strcmp(name, "commit-filter")) | 105 | else if (!strcmp(name, "commit-filter")) |
104 | ctx.cfg.commit_filter = new_filter(value, 0); | 106 | ctx.cfg.commit_filter = new_filter(value, 0); |
105 | else if (!strcmp(name, "embedded")) | 107 | else if (!strcmp(name, "embedded")) |
@@ -158,6 +160,8 @@ void config_cb(const char *name, const char *value) | |||
158 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
159 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
160 | ctx.repo->module_link= xstrdup(value); | 162 | ctx.repo->module_link= xstrdup(value); |
163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | ||
164 | ctx.repo->about_filter = new_filter(value, 0); | ||
161 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
162 | ctx.repo->commit_filter = new_filter(value, 0); | 166 | ctx.repo->commit_filter = new_filter(value, 0); |
163 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |