Skip to content
This repository
Browse code

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 2 changed files with 5 additions and 1 deletion. Show diff stats Hide diff stats

  1. +4 0 Changelog.md
  2. +1 1  app/helpers/sessions_helper.rb
4 Changelog.md
Source Rendered
... ... @@ -1,5 +1,9 @@
1 1 # 0.0.2.0pre
2 2
  3 +Fix error with open/close registrations.
  4 +Fix javascripts error in invitations facebox.
  5 +Fix css overflow problem in aspect dropdown on welcome page.
  6 +
3 7 # 0.0.1.1
4 8
5 9 Fix syntax error in French Javascript pluralization rule.
2  app/helpers/sessions_helper.rb
@@ -9,7 +9,7 @@ def prefilled_username
9 9 end
10 10
11 11 def display_registration_link?
12   - !AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
  12 + AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
13 13 end
14 14
15 15 def display_password_reset_link?

0 comments on commit d979ac4

Please sign in to comment.
Something went wrong with that request. Please try again.