Download as
Browse Code »

Commit 4a3e8b3d4b7c65a2e201c8e58628b40e112c705f

Authored by Sergio Oliveira
2 parents d9d6f997 4272b47a
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 'bootstrap' of github.com:TracyWebTech/colab into bootstrap

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
requirements.txt
  Diff comments   View file @4a3e8b3
@@ -21,7 +21,7 @@ django-browserid @@ -21,7 +21,7 @@ django-browserid
21 git+https://github.com/TracyWebTech/django-revproxy/ 21 git+https://github.com/TracyWebTech/django-revproxy/
22 22
23 # Converse.js (XMPP client) 23 # Converse.js (XMPP client)
24 -django-conversejs==0.2.2 24 +django-conversejs
25 25
26 # Feedzilla (planet) and deps 26 # Feedzilla (planet) and deps
27 https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around 27 https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around
src/accounts/migrations/0002_delete_sussumu_dup.py
  Diff comments   View file @4a3e8b3
@@ -7,7 +7,10 @@ from django.db import models @@ -7,7 +7,10 @@ from django.db import models
7 class Migration(DataMigration): 7 class Migration(DataMigration):
8 8
9 def forwards(self, orm): 9 def forwards(self, orm):
10 - sussumu = orm['accounts.User'].objects.get(username='Sussumu') 10 + try:
  11 + sussumu = orm['accounts.User'].objects.get(username='Sussumu')
  12 + except orm['accounts.User'].DoesNotExist:
  13 + return
11 profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk) 14 profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk)
12 sussumu.delete() 15 sussumu.delete()
13 profile.delete() 16 profile.delete()