Download as
Browse Code »

Commit 310d050a5f812f1f8d0c6e2fe033c307c55beaba

Authored by Sergio Oliveira
2 parents 677567b6 9d290dd6
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

Merge branch 'master' of github.com:colab-community/colab 

Conflicts:
	src/proxy/urls.py
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
src/colab/local_settings-dev.py
  Diff comments   View file @310d050
@@ -32,7 +32,7 @@ DATABASES['trac']['HOST'] = 'localhost' @@ -32,7 +32,7 @@ DATABASES['trac']['HOST'] = 'localhost'
32 32
33 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' 33 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
34 34
35 -COLAB_TRAC_URL = 'http://localhost:5000/' 35 +COLAB_TRAC_URL = 'http://localhost:5000/trac/'
36 COLAB_CI_URL = 'http://localhost:8080/ci/' 36 COLAB_CI_URL = 'http://localhost:8080/ci/'
37 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' 37 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
38 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' 38 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'