Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3649 from movilla/display_registration

Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
  • Loading branch information...
commit d979ac449957b39bc9fa390770d42dcb9563b0ab 2 parents e6ec419 + 928a8a0
Jonne Haß jhass authored
Showing with 5 additions and 1 deletion.
  1. +4 −0 Changelog.md
  2. +1 −1  app/helpers/sessions_helper.rb
4 Changelog.md
View
@@ -1,5 +1,9 @@
# 0.0.2.0pre
+Fix error with open/close registrations.
+Fix javascripts error in invitations facebox.
+Fix css overflow problem in aspect dropdown on welcome page.
+
# 0.0.1.1
Fix syntax error in French Javascript pluralization rule.
2  app/helpers/sessions_helper.rb
View
@@ -9,7 +9,7 @@ def prefilled_username
end
def display_registration_link?
- !AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
+ AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
end
def display_password_reset_link?
Please sign in to comment.
Something went wrong with that request. Please try again.