Merge branch 'dev' into fix-1989

app/controllers/forums_controller.rb

@@ -1,6 +1,7 @@
 class ForumsController < ApplicationController
   load_and_authorize_resource
   respond_to :html, :json
+  responders :flash
 
   # GET /forums
   # GET /forums.json

app/controllers/gardens_controller.rb

@@ -2,6 +2,7 @@ class GardensController < ApplicationController
   before_action :authenticate_member!, except: %i(index show)
   after_action :expire_homepage, only: %i(create destroy)
   load_and_authorize_resource
+  responders :flash
   respond_to :html, :json
 
   # GET /gardens

app/controllers/posts_controller.rb

@@ -1,6 +1,7 @@
 class PostsController < ApplicationController
   before_action :authenticate_member!, except: %i(index show)
   load_and_authorize_resource
+  responders :flash
   respond_to :html, :json
   respond_to :rss, only: %i(index show)
 

app/controllers/seeds_controller.rb

@@ -1,6 +1,7 @@
 class SeedsController < ApplicationController
   before_action :authenticate_member!, except: %i(index show)
   load_and_authorize_resource
+  responders :flash
   respond_to :html, :json
   respond_to :csv, only: :index
   respond_to :rss, only: :index

app/views/layouts/_header.html.haml

@@ -46,8 +46,10 @@
             = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
 
             - if current_member.notifications.unread_count.positive?
-              = link_to(t('.inbox_unread', unread_count: current_member.notifications.unread_count),
-                        notifications_path)
+              .dropdown-divider
+              %strong= link_to(t('.inbox_unread',
+                        unread_count: current_member.notifications.unread_count),
+                        notifications_path, class: 'dropdown-item')
             - else
               = link_to t('.inbox'), notifications_path, class: 'dropdown-item'
 

config/initializers/leaflet.rb

@@ -0,0 +1,3 @@
+Leaflet.tile_layer = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+Leaflet.attribution = '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'
+Leaflet.max_zoom = 18