Download as
Browse Code »

Commit f2be76e1465dc53e124a06fa89b275b90c28be60

Authored by Gust
1 parent 3a874b69
Exists in master and in 34 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Remove dpaste dependencies and update docs 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Showing 3 changed files with 15 additions and 7 deletions   Show diff stats
colab/management/initconfig.py
  Diff comments   View file @f2be76e
@@ -93,6 +93,8 @@ COLAB_STATICS: @@ -93,6 +93,8 @@ COLAB_STATICS:
93 # Issues: 'gitlab/dashboard/issues' 93 # Issues: 'gitlab/dashboard/issues'
94 # Merge Requests: 'gitlab/merge_requests' 94 # Merge Requests: 'gitlab/merge_requests'
95 # dpaste: 95 # dpaste:
  96 +# dependencies:
  97 +# - 'mptt'
96 # urls: 98 # urls:
97 # include: 'dpaste.urls.dpaste' 99 # include: 'dpaste.urls.dpaste'
98 # prefix: '^paste/' 100 # prefix: '^paste/'
colab/settings.py
  Diff comments   View file @f2be76e
@@ -49,7 +49,6 @@ INSTALLED_APPS = ( @@ -49,7 +49,6 @@ INSTALLED_APPS = (
49 'haystack', 49 'haystack',
50 'hitcounter', 50 'hitcounter',
51 'i18n_model', 51 'i18n_model',
52 - 'mptt',  
53 'taggit', 52 'taggit',
54 53
55 # Own apps 54 # Own apps
docs/source/user.rst
  Diff comments   View file @f2be76e
@@ -27,8 +27,15 @@ Plugins @@ -27,8 +27,15 @@ Plugins
27 27
28 Declares the upstream server url of the proxy. Only declare if the plugin is a proxy. 28 Declares the upstream server url of the proxy. Only declare if the plugin is a proxy.
29 29
  30 +dependecies
  31 ++++++++++++
  32 +
  33 + A list of the plugin dependecies that will be added to INSTALLED_APPS.
  34 + This doesn't automatically install the python dependecies, only add to django apps.
  35 +
  36 +
30 menu 37 menu
31 -++++++++++++ 38 +++++
32 39
33 .. attribute:: title 40 .. attribute:: title
34 41
@@ -44,7 +51,7 @@ menu @@ -44,7 +51,7 @@ menu
44 Declares a list of the plugin dependecies. 51 Declares a list of the plugin dependecies.
45 52
46 urls 53 urls
47 -++++++++++++ 54 +++++
48 55
49 .. attribute:: include 56 .. attribute:: include
50 57
@@ -57,18 +64,18 @@ urls @@ -57,18 +64,18 @@ urls
57 Declares the namespace for the url. 64 Declares the namespace for the url.
58 65
59 context_processors 66 context_processors
60 -++++++++++++ 67 +++++++++++++++++++
61 68
62 Declares the plugin context processors. 69 Declares the plugin context processors.
63 70
64 middlewares 71 middlewares
65 -++++++++++++ 72 ++++++++++++
66 73
67 Declares the plugin middlewares. 74 Declares the plugin middlewares.
68 75
69 76
70 Extra Template Folders 77 Extra Template Folders
71 -++++++++++++ 78 +++++++++++++++++++++++
72 79
73 .. attribute:: COLAB_TEMPLATES 80 .. attribute:: COLAB_TEMPLATES
74 81
@@ -78,7 +85,7 @@ Extra Template Folders @@ -78,7 +85,7 @@ Extra Template Folders
78 85
79 86
80 Extra Static Folders 87 Extra Static Folders
81 -++++++++++++ 88 +++++++++++++++++++++
82 89
83 .. attribute:: COLAB_STATIC 90 .. attribute:: COLAB_STATIC
84 91