Skip to content

Commit

Permalink
Merge branch 'edge'
Browse files Browse the repository at this point in the history
  • Loading branch information
xirdneh committed Jul 24, 2017
2 parents 55fca94 + cf0473f commit 0439452
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 138 deletions.
2 changes: 1 addition & 1 deletion conf/uwsgi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module=designsafe.wsgi:application
master = True
pidfile = /tmp/django-master.pid
vacuum = True
processes = 20
processes = 50
buffer-size = 65535
harakiri = 120
#post-buffering = 4096
Expand Down
2 changes: 1 addition & 1 deletion designsafe/apps/accounts/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class UserRegistrationForm(forms.Form):
label='I Agree to the <a href="/terms/" target="_blank">Terms of Use</a>',
error_messages={'required': 'Please Accept the DesignSafe Terms of Use.'})

captcha = NoReCaptchaField()
#captcha = NoReCaptchaField()

def __init__(self, *args, **kwargs):
super(UserRegistrationForm, self).__init__(*args, **kwargs)
Expand Down
269 changes: 135 additions & 134 deletions designsafe/apps/rapid/static/designsafe/apps/rapid/build/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0439452

Please sign in to comment.