Merge branch 'stable'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index 3359be94dac71a6ea64f3844a3a6b296ae96b058..8884f9e500dddb7d403ed1877217d8f3600bb041 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -72,6 +72,8 @@ struct cgit_repo {
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;

+       int enable_remote_branches;
+       int enable_subject_links;

        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;


@@ -143,6 +145,8 @@ struct cgit_query {
        int nohead;
        char *sort;
        int showmsg;
        int nohead;
        char *sort;
        int showmsg;

+       int ssdiff;
+       int show_all;

 };
 
 struct cgit_config {
 };
 
 struct cgit_config {


@@ -174,15 +178,21 @@ struct cgit_config {
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int embedded;
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int embedded;

+       int enable_filter_overrides;

        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;

+       int enable_remote_branches;
+       int enable_subject_links;
+       int enable_tree_linenumbers;

        int local_time;
        int local_time;

+       int max_atom_items;

        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;

+       int max_blob_size;

        int max_stats;
        int nocache;
        int noplainemail;
        int max_stats;
        int nocache;
        int noplainemail;


@@ -192,6 +202,7 @@ struct cgit_config {
        int summary_branches;
        int summary_log;
        int summary_tags;
        int summary_branches;
        int summary_log;
        int summary_tags;

+       int ssdiff;

        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;