Merge branch 'master' into include_speaker_email_in_events

2017-11-07 17:19:42 -08:00 · 2017-11-07 17:19:42 -08:00 · aca8adf6e8
commit aca8adf6e8
parent 94de2e813c 51dd5bdaa9
12 changed files with 151 additions and 14 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@ -15,7 +15,7 @@ class Ability

  # Abilities for not signed in users (guests)
  def not_signed_in
-    can [:index], Organization
+    can [:index, :conferences], Organization
    can [:index], Conference
    can [:show], Conference do |conference|
      conference.splashpage && conference.splashpage.public == true