Download as
Browse Code »

Commit 9475b27bf2819c88980f2c45dcadd2dbc4d5411c

Authored by Carlos Coêlho
1 parent 80dfda89
Exists in master and in 39 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_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixed settings import in form 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
colab/accounts/forms.py
  Diff comments   View file @9475b27
@@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _ @@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _
15 15
16 from conversejs.models import XMPPAccount 16 from conversejs.models import XMPPAccount
17 17
18 -from colab import settings 18 +from django.conf import settings
19 19
20 from .utils.validators import validate_social_account 20 from .utils.validators import validate_social_account
21 from .utils import mailman 21 from .utils import mailman
tests/settings.py
  Diff comments   View file @9475b27
1 from colab.settings import * # noqa 1 from colab.settings import * # noqa
2 2
3 - 3 +SOCIAL_NETWORK_ENABLED = True
4 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage' 4 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
5 5
6 LOGGING = { 6 LOGGING = {