Make use of ENV.fetch

app/views/layouts/_admin_sidebar_index.html.haml

@@ -37,7 +37,7 @@
       = link_to(admin_revision_history_path) do
         %span.fa.fa-history
         Revision History
-    - if ENV['ORGANIZATIONS_ENABLED'] == 'true'
+    - if ENV.fetch('ORGANIZATIONS_ENABLED', nil) == 'true'
       %li
         = link_to(admin_organizations_path) do
           %span.fa.fa-group

app/views/layouts/_navigation.html.haml

@@ -32,7 +32,7 @@
                 = render 'layouts/user_menu'
       - else
         %ul.nav.navbar-nav.navbar-right
-          - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+          - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
             %li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"}
               = link_to(new_ichain_registration_path('user')) do
                 %span.fa.fa-heart
@@ -48,7 +48,7 @@
               Sign In
               %span.caret
             .dropdown-menu
-              - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+              - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
                 = form_tag User.ichain_login_url do
                   = text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username'
                   = password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password'

app/views/layouts/_user_menu.html.haml

@@ -10,7 +10,7 @@
     %li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
   %li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')
   %li.divider
-- unless ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+- unless ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
   %li
     = link_to(edit_user_registration_path) do
       %span.fa.fa-wrench
@@ -40,7 +40,7 @@
       %span.fa.fa-shopping-bag
       My #{(t'booth').capitalize } Requests
 %li
-  - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+  - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
     = link_to(destroy_user_ichain_session_path, method: 'delete') do
       %span.fa.fa-minus
       Sign out
@@ -76,7 +76,7 @@
     = link_to(admin_revision_history_path) do
       %span.fa.fa-history
       Revision History
-  - if ENV['ORGANIZATIONS_ENABLED'] == 'true'
+  - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
     %li
       = link_to(admin_organizations_path) do
         %span.fa.fa-group

app/views/layouts/application.html.haml

@@ -2,7 +2,7 @@
   %head
     %meta{charset: 'utf-8'}
     %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
-    %title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
+    %title= content_for?(:title) ? yield(:title) : ENV.fetch('OSEM_NAME', 'OSEM')
     %meta{content: '', name: 'description'}
     %meta{content: '', name: 'author'}
     = stylesheet_link_tag "application", media: 'all'
@@ -10,7 +10,7 @@
 
     = csrf_meta_tags
     = content_for(:script_head)
-    - if ENV['OSEM_TRANSIFEX_APIKEY']
+    - if ENV.fetch('OSEM_TRANSIFEX_APIKEY', nil)
       :javascript
         window.liveSettings = {
           api_key: "#{ENV['OSEM_TRANSIFEX_APIKEY']}",
@@ -46,7 +46,7 @@
             You can run, copy, distribute, study, change and improve it.
             The source code and the developers are on
             #{link_to "GitHub", "https://github.com/openSUSE/osem"}.
-            - if ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"].present?
+            - if ENV.fetch('SKYLIGHT_PUBLIC_DASHBOARD_URL', nil)
               Performance data is available on
               #{link_to "Skylight", ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"]}.
     = yield :script_body