Download as
Browse Code »

Commit 74ccc42dd5901864b87f9065395b346c7f079e6b

Authored by Gust
3 parents 1c196101 f694a7c2 e409ade7
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 'update_puppet_django1-6', remote-tracking branch 'origin' into update_puppet

Showing 5 changed files with 13 additions and 11 deletions   Show diff stats
@@ -140,7 +140,7 @@ def collectstatic(): @@ -140,7 +140,7 @@ def collectstatic():
140 140
141 141
142 def create_local_settings(): 142 def create_local_settings():
143 - with cd(SETTINGS_PATH), settings(user=env.superuser): 143 + with cd(SETTINGS_PATH):
144 env_local_settings = 'local_settings-{}.py'.format(env.environment) 144 env_local_settings = 'local_settings-{}.py'.format(env.environment)
145 145
146 if not exists('local_settings.py') and exists(env_local_settings): 146 if not exists('local_settings.py') and exists(env_local_settings):
@@ -247,13 +247,13 @@ def ssh_keygen(): @@ -247,13 +247,13 @@ def ssh_keygen():
247 def deploy(noprovision=False): 247 def deploy(noprovision=False):
248 """Deploy and run the new code (master branch)""" 248 """Deploy and run the new code (master branch)"""
249 249
250 - fix_path()  
251 -  
252 if noprovision is False: 250 if noprovision is False:
253 provision() 251 provision()
254 else: 252 else:
255 update_code() 253 update_code()
256 254
  255 + fix_path()
  256 +
257 install_solr() 257 install_solr()
258 258
259 mkvirtualenv() 259 mkvirtualenv()
requirements.txt
  Diff comments   View file @74ccc42
1 -https://www.djangoproject.com/download/1.7c2/tarball/ # Download django 1.7 # 1 +Django>=1.6.1,<1.7
  2 +South==0.8.1
2 psycopg2==2.5.1 3 psycopg2==2.5.1
3 django-piston==0.2.3 4 django-piston==0.2.3
4 pytz==2011n 5 pytz==2011n
src/colab/custom_settings.py
  Diff comments   View file @74ccc42
@@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
93 'accounts', 93 'accounts',
94 94
95 # Not standard apps 95 # Not standard apps
  96 + 'south',
96 'raven.contrib.django.raven_compat', 97 'raven.contrib.django.raven_compat',
97 'cliauth', 98 'cliauth',
98 'django_mobile', 99 'django_mobile',
src/super_archives/managers.py
  Diff comments   View file @74ccc42
@@ -6,13 +6,13 @@ import django @@ -6,13 +6,13 @@ import django
6 class NotSpamManager(models.Manager): 6 class NotSpamManager(models.Manager):
7 """Only return objects which are not marked as spam.""" 7 """Only return objects which are not marked as spam."""
8 8
9 - def get_queryset(self):  
10 - return super(NotSpamManager, self).get_queryset().exclude(spam=True) 9 + def get_query_set(self):
  10 + return super(NotSpamManager, self).get_query_set().exclude(spam=True)
11 11
12 12
13 class HighestScore(NotSpamManager): 13 class HighestScore(NotSpamManager):
14 - def get_queryset(self):  
15 - queryset = super(HighestScore, self).get_queryset() 14 + def get_query_set(self):
  15 + queryset = super(HighestScore, self).get_query_set()
16 return queryset.order_by('-score', '-latest_message__received_time') 16 return queryset.order_by('-score', '-latest_message__received_time')
17 17
18 def from_haystack(self): 18 def from_haystack(self):
@@ -20,11 +20,11 @@ class HighestScore(NotSpamManager): @@ -20,11 +20,11 @@ class HighestScore(NotSpamManager):
20 20
21 21
22 class MostVotedManager(NotSpamManager): 22 class MostVotedManager(NotSpamManager):
23 - def get_queryset(self): 23 + def get_query_set(self):
24 """Query for the most voted messages sorting by the sum of 24 """Query for the most voted messages sorting by the sum of
25 voted and after by date.""" 25 voted and after by date."""
26 26
27 - queryset = super(MostVotedManager, self).get_queryset() 27 + queryset = super(MostVotedManager, self).get_query_set()
28 28
29 sql = """ 29 sql = """
30 SELECT 30 SELECT
src/templates/base.html
  Diff comments   View file @74ccc42
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 {% endif %} 90 {% endif %}
91 <li><a href="/roadmap">{% trans "Roadmap" %}</a></li> 91 <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
92 <li><a href="/browser">{% trans "Browse Source" %}</a></li> 92 <li><a href="/browser">{% trans "Browse Source" %}</a></li>
93 - <!-- TODO: Must be optional like trac and separated --!> 93 + <!-- TODO: Must be optional like trac and separated -->
94 <li><a href="/ci">{% trans "Continuous Integration" %}</a></li> 94 <li><a href="/ci">{% trans "Continuous Integration" %}</a></li>
95 </ul> 95 </ul>
96 </li> 96 </li>