kallithea Changeset - 08c0326e9127

Changeset - 08c0326e9127

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Mads Kiilerich - 6 years ago 2020-02-12 14:52:11
mads@kiilerich.com

Merge stable

3 files changed with 19 insertions and 13 deletions:

development.ini

kallithea/lib/paster_commands/template.ini.mako

kallithea/templates/base/base.html

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -54,11 +54,11 @@ error_email_from = @@
 ## For "SSL", use smtp_use_ssl = true and smtp_port = 465.
 ## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587.
 smtp_server =
 #smtp_username =
 #smtp_password =
 smtp_username =
 smtp_password =
 smtp_port =
 #smtp_use_ssl = false
 #smtp_use_tls = false
 smtp_use_ssl = false
 smtp_use_tls = false
 ## Entry point for 'gearbox serve'
 [server:main]
@@ @@ -259,7 +259,7 @@ celery.imports = kallithea.lib.celerylib @@
 celery.accept.content = pickle
 celery.result.backend = amqp
 celery.result.dburi = amqp://
-celery.result.serialier = json
+celery.result.serializer = json
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
@@ @@ -330,10 +330,13 @@ session.secret = development-not-secret @@
 # Propagate email settings to ErrorReporter of TurboGears2
 # You do not normally need to change these lines
 get trace_errors.error_email = email_to
 get trace_errors.smtp_server = smtp_server
 get trace_errors.smtp_port = smtp_port
 get trace_errors.from_address = error_email_from
 get trace_errors.error_email = email_to
 get trace_errors.smtp_username = smtp_username
 get trace_errors.smtp_password = smtp_password
 get trace_errors.smtp_use_tls = smtp_use_tls
 ################################################################################
 ## WARNING: *DEBUG MODE MUST BE OFF IN A PRODUCTION ENVIRONMENT*              ##

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -55,11 +55,11 @@ error_email_from = @@
 <%text>## For "SSL", use smtp_use_ssl = true and smtp_port = 465.</%text>
 <%text>## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587.</%text>
 smtp_server =
 #smtp_username =
 #smtp_password =
 smtp_username =
 smtp_password =
 smtp_port =
 #smtp_use_ssl = false
 #smtp_use_tls = false
 smtp_use_ssl = false
 smtp_use_tls = false
 %if http_server != 'uwsgi':
 <%text>## Entry point for 'gearbox serve'</%text>
@@ @@ -365,7 +365,7 @@ celery.imports = kallithea.lib.celerylib @@
 celery.accept.content = pickle
 celery.result.backend = amqp
 celery.result.dburi = amqp://
-celery.result.serialier = json
+celery.result.serializer = json
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
@@ @@ -435,10 +435,13 @@ session.secret = ${uuid()} @@
 # Propagate email settings to ErrorReporter of TurboGears2
 # You do not normally need to change these lines
 get trace_errors.error_email = email_to
 get trace_errors.smtp_server = smtp_server
 get trace_errors.smtp_port = smtp_port
 get trace_errors.from_address = error_email_from
 get trace_errors.error_email = email_to
 get trace_errors.smtp_username = smtp_username
 get trace_errors.smtp_password = smtp_password
 get trace_errors.smtp_use_tls = smtp_use_tls
 %if error_aggregation_service == 'appenlight':
 <%text>####################</%text>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -163,7 +163,7 @@ @@
               ## also it feels like a job for the controller
               %if request.authuser.username != 'default':
                   <li>
                    <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});">
+                   <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="return toggleFollowingRepo(this, ${c.db_repo.repo_id});">
                     <span class="show-follow"><i class="icon-heart-empty"></i>${_('Follow')}</span>
                     <span class="show-following"><i class="icon-heart"></i>${_('Unfollow')}</span>
                    </a>

0 comments (0 inline, 0 general)