Commit
556e3b9c3793c343a1ce8695fddcb6430658fd84
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
Renaming settings_local to local_settings
| @@ -57,6 +57,6 @@ SOLR_BASE_QUERY = """ |
| @@ -57,6 +57,6 @@ SOLR_BASE_QUERY = """ |
57
| """ |
57
| """ |
58
| |
58
| |
59
| try: |
59
| try: |
60
| - from settings_local import * |
60
| + from local_settings import * |
61
| except ImportError: |
61
| except ImportError: |
62
| pass |
62
| pass |