From 075b9b33278eb23724e0bfb1235e592c39418222 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:15:54 +1200
Subject: [PATCH 01/25] Add a ban button to members

---
 app/controllers/members_controller.rb | 14 ++++++++++----
 app/views/members/show.html.haml      |  7 +++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 76411b0ec..34c123012 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -38,10 +38,11 @@ class MembersController < ApplicationController
     end
   end
 
-  EMAIL_TYPE_STRING = {
-    send_notification_email: "direct message notifications",
-    send_planting_reminder:  "planting reminders"
-  }.freeze
+  def destroy
+    @member = Member.find_by!(slug: params[:slug])
+    @member.destroy
+    redirect_to admin_path
+  end
 
   def unsubscribe
     verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
@@ -72,6 +73,11 @@ class MembersController < ApplicationController
 
   private
 
+  EMAIL_TYPE_STRING = {
+    send_notification_email: "direct message notifications",
+    send_planting_reminder:  "planting reminders"
+  }.freeze
+
   def member_params
     params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter)
   end
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 8031e151a..1ba5da1b2 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -45,6 +45,13 @@
 
         = render 'members/follow_buttons', member: @member
 
+        - if can?(:destroy, @member)
+          %hr/
+          = link_to member_path(@member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do
+            = icon 'fas', 'ban'
+            Ban member
+          %hr/
+
       = render "stats", member: @member
       .card-footer
         = render "contact", member: @member, twitter_auth: @twitter_auth,

From 062282381677cbaee4cf6c13e3cbb218bbca709a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:17:37 +1200
Subject: [PATCH 02/25] Remove unused db lookup

---
 app/controllers/members_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 34c123012..08519bdbc 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -17,7 +17,6 @@ class MembersController < ApplicationController
     @twitter_auth  = @member.auth('twitter')
     @flickr_auth   = @member.auth('flickr')
     @facebook_auth = @member.auth('facebook')
-    @posts         = @member.posts
 
     @activity = TimelineService.member_query(@member).limit(30)
 

From 72d5d2e81affe4416221c2cc29163427e962cb58 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:17:57 +1200
Subject: [PATCH 03/25] Match role names to names in the seeds

---
 lib/tasks/growstuff.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index 4f22214ea..d36b7bd95 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -3,14 +3,14 @@ namespace :growstuff do
   # usage: rake growstuff:admin_user name=skud
 
   task admin_user: :environment do
-    add_role_to_member! ENV['name'], 'admin'
+    add_role_to_member! ENV['name'], 'Admin'
   end
 
   desc "Add a crop wrangler user, by name"
   # usage: rake growstuff:cropwrangler_user name=skud
 
   task cropwrangler_user: :environment do
-    add_role_to_member! ENV['name'], 'crop-wrangler'
+    add_role_to_member! ENV['name'], 'Crop Wrangler'
   end
 
   def add_role_to_member!(login_name, role_name)

From 29823fd953b93170a069280acff95463d1a957e0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:18:14 +1200
Subject: [PATCH 04/25] Make the follow button stand out

---
 app/views/members/_follow_buttons.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/members/_follow_buttons.haml b/app/views/members/_follow_buttons.haml
index 82a2b7d88..244dc15f4 100644
--- a/app/views/members/_follow_buttons.haml
+++ b/app/views/members/_follow_buttons.haml
@@ -1,6 +1,6 @@
 - if current_member && current_member != member # must be logged in, can't follow yourself
   - follow = current_member.get_follow(member)
   - if !follow && can?(:create, Follow) # not already following
-    = link_to 'Follow', follows_path(followed: member), method: :post, class: 'btn btn-block'
+    = link_to 'Follow', follows_path(followed: member), method: :post, class: 'btn btn-block btn-success'
   - if follow && can?(:destroy, follow) # already following
     = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
\ No newline at end of file

From 8827fb1291d53d74f2e2787f3f90044f5ae3ed69 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:31:43 +1200
Subject: [PATCH 05/25] go to admin_members_path after banning a member

---
 app/controllers/members_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 08519bdbc..73f1b7944 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -40,7 +40,7 @@ class MembersController < ApplicationController
   def destroy
     @member = Member.find_by!(slug: params[:slug])
     @member.destroy
-    redirect_to admin_path
+    redirect_to admin_members_path
   end
 
   def unsubscribe

From 006c7f02f544efff858e5931bfa561647f3a1703 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:31:53 +1200
Subject: [PATCH 06/25] feature specs for banning a member

---
 spec/features/members/ban_spec.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 spec/features/members/ban_spec.rb

diff --git a/spec/features/members/ban_spec.rb b/spec/features/members/ban_spec.rb
new file mode 100644
index 000000000..8eb2888e7
--- /dev/null
+++ b/spec/features/members/ban_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe "members list" do
+  let!(:spammer) { FactoryBot.create :member }
+  let!(:admin) { FactoryBot.create :admin_member }
+
+  context 'logged in  as admin' do
+    before do
+      login_as admin
+      visit member_path(spammer)
+    end
+    it { expect(page).to have_link "Ban member" }
+    describe 'bans the user' do
+      before do
+        accept_confirm { click_link 'Ban member' }
+      end
+      it { expect(page).to have_link admin.login_name }
+      it { expect(page).not_to have_link spammer.login_name }
+    end
+  end
+end

From b2537638ed27f075df39c3e0198a3c9a8ea19adf Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 18:56:49 +1200
Subject: [PATCH 07/25] Move member banning to admin/members controller

---
 app/controllers/admin/members_controller.rb |  7 +++++++
 app/controllers/members_controller.rb       |  5 -----
 app/views/admin/members/index.html.haml     | 19 ++++++++++++-------
 app/views/members/show.html.haml            |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 55cbdcf34..e59c9bf0b 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -1,10 +1,17 @@
 module Admin
   class MembersController < ApplicationController
     before_action :auth!
+
     def index
       @members = Member.order(:login_name).paginate(page: params[:page])
     end
 
+    def destroy
+      @member = Member.find_by!(slug: params[:id])
+      @member.destroy
+      redirect_to admin_members_path
+    end
+
     private
 
     def auth!
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 73f1b7944..50fc5322b 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -37,11 +37,6 @@ class MembersController < ApplicationController
     end
   end
 
-  def destroy
-    @member = Member.find_by!(slug: params[:slug])
-    @member.destroy
-    redirect_to admin_members_path
-  end
 
   def unsubscribe
     verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
diff --git a/app/views/admin/members/index.html.haml b/app/views/admin/members/index.html.haml
index d91b1f8a1..522c659c6 100644
--- a/app/views/admin/members/index.html.haml
+++ b/app/views/admin/members/index.html.haml
@@ -2,14 +2,19 @@
   = page_entries_info @members
   = will_paginate @members
 
-
 %table.table.table-striped
-  %tr
-    %th Name
-    %th Email
-    %th
-    %th
+  %thead
+    %tr
+      %th{scope: "col"} #
+      %th{scope: "col"} Login Name
+      %th{scope: "col"} Email
   - @members.each do |member|
     %tr
-      %td= member.login_name
+      %td= render 'members/tiny', member: member
+      %td
+        = link_to member, member
       %td= member.email
+      %td
+        = link_to admin_member_path(member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-light text-danger' do
+          = icon 'fas', 'ban'
+          Ban member
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 1ba5da1b2..ea49a031a 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -47,7 +47,7 @@
 
         - if can?(:destroy, @member)
           %hr/
-          = link_to member_path(@member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do
+          = link_to admin_member_path(@member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do
             = icon 'fas', 'ban'
             Ban member
           %hr/

From c8e47e800e34e2b0687744fbff7ad803f9d896e7 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 20:54:32 +1200
Subject: [PATCH 08/25] Moved admin ban code to admin controler

---
 app/controllers/admin/members_controller.rb | 2 +-
 app/views/members/show.html.haml            | 2 +-
 config/routes.rb                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index e59c9bf0b..ca35129b3 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -7,7 +7,7 @@ module Admin
     end
 
     def destroy
-      @member = Member.find_by!(slug: params[:id])
+      @member = Member.find_by!(slug: params[:slug])
       @member.destroy
       redirect_to admin_members_path
     end
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index ea49a031a..2560ef9ae 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -47,7 +47,7 @@
 
         - if can?(:destroy, @member)
           %hr/
-          = link_to admin_member_path(@member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do
+          = link_to admin_member_path(slug: @member.slug), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do
             = icon 'fas', 'ban'
             Ban member
           %hr/
diff --git a/config/routes.rb b/config/routes.rb
index aa93d3c5d..c9d76821b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,7 +109,7 @@ Rails.application.routes.draw do
   get 'members/auth/:provider/callback' => 'authentications#create'
 
   scope :admin do
-    resources :members, controller: 'admin/members', as: 'admin_members'
+    resources :members , param: :slug, controller: 'admin/members', as: 'admin_members'
     get '/' => 'admin#index', as: 'admin'
     get '/newsletter' => 'admin#newsletter', as: 'admin_newsletter'
     comfy_route :cms_admin, path: '/cms'

From bf77d4b913fe961b1e4c25f0252397fe48bc1314 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 20:55:09 +1200
Subject: [PATCH 09/25] removed test for @posts variables on members controller

because that variable isn't used so it doesn't exist anymore
---
 spec/controllers/member_controller_spec.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb
index 173b0ff0e..87a95ccb0 100644
--- a/spec/controllers/member_controller_spec.rb
+++ b/spec/controllers/member_controller_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 describe MembersController do
   before do
     @member = FactoryBot.create(:member)
-    @posts = [FactoryBot.create(:post, author: @member)]
     @twitter_auth = FactoryBot.create(:authentication, member: @member)
     @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
   end
@@ -28,11 +27,6 @@ describe MembersController do
       response.should be_successful
     end
 
-    it "assigns @posts with the member's posts" do
-      get :show, params: { slug: @member.to_param }
-      assigns(:posts).should eq(@posts)
-    end
-
     it "assigns @twitter_auth" do
       get :show, params: { slug: @member.to_param }
       assigns(:twitter_auth).should eq(@twitter_auth)

From fb77beeb7d8491b8a1ffd093da751d0fa5f9559f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 20:56:33 +1200
Subject: [PATCH 10/25] rubocop lint

---
 app/controllers/members_controller.rb | 1 -
 config/routes.rb                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 50fc5322b..f0714bf5f 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -37,7 +37,6 @@ class MembersController < ApplicationController
     end
   end
 
-
   def unsubscribe
     verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
     decrypted_message = verifier.verify(params[:message])
diff --git a/config/routes.rb b/config/routes.rb
index c9d76821b..055b276af 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,7 +109,7 @@ Rails.application.routes.draw do
   get 'members/auth/:provider/callback' => 'authentications#create'
 
   scope :admin do
-    resources :members , param: :slug, controller: 'admin/members', as: 'admin_members'
+    resources :members, param: :slug, controller: 'admin/members', as: 'admin_members'
     get '/' => 'admin#index', as: 'admin'
     get '/newsletter' => 'admin#newsletter', as: 'admin_newsletter'
     comfy_route :cms_admin, path: '/cms'

From 312cd0d770c2ddbf8cc21b2e3422b5eb6396cdd9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 16 Jul 2019 23:10:01 +1200
Subject: [PATCH 11/25] Read posts from member.posts

---
 app/controllers/members_controller.rb | 1 +
 app/views/members/show.rss.haml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index f0714bf5f..d044836ed 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -17,6 +17,7 @@ class MembersController < ApplicationController
     @twitter_auth  = @member.auth('twitter')
     @flickr_auth   = @member.auth('flickr')
     @facebook_auth = @member.auth('facebook')
+    @posts         = @member.posts
 
     @activity = TimelineService.member_query(@member).limit(30)
 
diff --git a/app/views/members/show.rss.haml b/app/views/members/show.rss.haml
index 075e3fafb..bb28ff632 100644
--- a/app/views/members/show.rss.haml
+++ b/app/views/members/show.rss.haml
@@ -3,7 +3,7 @@
   %channel
     %title #{@member.login_name}'s recent posts (#{ENV['GROWSTUFF_SITE_NAME']})
     %link= member_url(@member)
-    - @posts.each do |post|
+    - @member.posts.each do |post|
       %item
         %title #{post.subject} by #{post.author.login_name}
         %pubdate= post.created_at.to_s(:rfc822)

From 4ce2eca670ff4ff8b8755c3a1a74a13b013ff9a9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 08:37:54 +1200
Subject: [PATCH 12/25] Comment out member avatar until we work out why it's
 breaking

---
 app/views/notifications/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 484fe6c10..fb28cb6e7 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -23,7 +23,7 @@
           .col-6.col-md-3.text-right
             = link_to n.sender do
               %h3
-                = render 'members/tiny', member: n.sender
+                /= render 'members/tiny', member: n.sender
                 = n.sender
             = render 'members/follow_buttons', member: n.sender
       .card-footer

From 42269e32615565992d2253ecef93cbba58f5d7d9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 08:37:54 +1200
Subject: [PATCH 13/25] Comment out member avatar until we work out why it's
 breaking

---
 app/views/notifications/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 484fe6c10..fb28cb6e7 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -23,7 +23,7 @@
           .col-6.col-md-3.text-right
             = link_to n.sender do
               %h3
-                = render 'members/tiny', member: n.sender
+                /= render 'members/tiny', member: n.sender
                 = n.sender
             = render 'members/follow_buttons', member: n.sender
       .card-footer

From e0dcd0226e5251d8a5b11cf4fdfc1f762c6835a9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 09:09:16 +1200
Subject: [PATCH 14/25] Handle messages from deleted members

---
 app/views/notifications/index.html.haml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index fb28cb6e7..d6ac4b5b3 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -21,11 +21,14 @@
                 %strong unread
               = n.created_at
           .col-6.col-md-3.text-right
-            = link_to n.sender do
-              %h3
-                /= render 'members/tiny', member: n.sender
-                = n.sender
-            = render 'members/follow_buttons', member: n.sender
+            - if n.sender.present?
+              = link_to n.sender do
+                %h3
+                  = render 'members/tiny', member: n.sender
+                  = n.sender
+              = render 'members/follow_buttons', member: n.sender
+            - else
+              Member deleted
       .card-footer
         = link_to 'Read', n, class: 'btn btn-primary'
         = link_to 'Reply', reply_link(n), class: 'btn btn-secondary'

From c8a721c30443d9f2e1ab263459349ba4c038391c Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 09:22:25 +1200
Subject: [PATCH 15/25] Fixes error displaying messages from deleted members

---
 app/views/notifications/show.html.haml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/notifications/show.html.haml b/app/views/notifications/show.html.haml
index 2303c9ea5..5a3e908e3 100644
--- a/app/views/notifications/show.html.haml
+++ b/app/views/notifications/show.html.haml
@@ -7,9 +7,13 @@
   .card-header
     .card-title= @notification.subject
     .float-right
-      = link_to @notification.sender do
-        = @notification.sender
-        = render 'members/tiny', member: @notification.sender
+      - if n.sender.present?
+        = link_to @notification.sender do
+          = @notification.sender
+          = render 'members/tiny', member: @notification.sender
+      - else
+        Member deleted
+
   .card-body
     = render @notification
 

From f46cc3151540f6ae10798a42ed554e781630d7ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2019 10:54:48 +0000
Subject: [PATCH 16/25] Bump capybara from 3.25.0 to 3.26.0

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.25.0...3.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e89b3ed3..b4f9ede7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
       uniform_notifier (~> 1.11)
     byebug (11.0.1)
     cancancan (3.0.1)
-    capybara (3.25.0)
+    capybara (3.26.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -297,7 +297,7 @@ GEM
     mime-types-data (3.2019.0331)
     mimemagic (0.3.3)
     mini_magick (4.9.3)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     moneta (1.0.0)

From 608cad2615e18985b03925c2c2256fc700286960 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 10:22:35 +1200
Subject: [PATCH 17/25] Fix variable name

---
 app/views/notifications/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/show.html.haml b/app/views/notifications/show.html.haml
index 5a3e908e3..941fc6c46 100644
--- a/app/views/notifications/show.html.haml
+++ b/app/views/notifications/show.html.haml
@@ -7,7 +7,7 @@
   .card-header
     .card-title= @notification.subject
     .float-right
-      - if n.sender.present?
+      - if notification.sender.present?
         = link_to @notification.sender do
           = @notification.sender
           = render 'members/tiny', member: @notification.sender

From 7f45b194e99343598b7f2910a255d93e0f14bdf8 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 17 Jul 2019 11:47:24 +1200
Subject: [PATCH 18/25] Update app/views/notifications/show.html.haml

---
 app/views/notifications/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/show.html.haml b/app/views/notifications/show.html.haml
index 941fc6c46..84a8a29f2 100644
--- a/app/views/notifications/show.html.haml
+++ b/app/views/notifications/show.html.haml
@@ -7,7 +7,7 @@
   .card-header
     .card-title= @notification.subject
     .float-right
-      - if notification.sender.present?
+      - if @notification.sender.present?
         = link_to @notification.sender do
           = @notification.sender
           = render 'members/tiny', member: @notification.sender

From b7175a2e327678c05c3adb2e56c9f2726339cf44 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 09:31:43 +0000
Subject: [PATCH 19/25] [Security] Bump mini_magick from 4.9.3 to 4.9.4

Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.9.3 to 4.9.4. **This update includes security fixes.**
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.9.3...v4.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b4f9ede7e..faf9341f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mimemagic (0.3.3)
-    mini_magick (4.9.3)
+    mini_magick (4.9.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)

From 64fa4584b990778c3d4feb2e2edd150479b3b335 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 20:29:38 +0000
Subject: [PATCH 20/25] Bump rubocop from 0.72.0 to 0.73.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index faf9341f9..d90e7fc2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -424,7 +424,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubocop (0.72.0)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)

From e4512beb03ea8513f53c89123ae5c1527f6cd9a9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2019 16:23:55 +0000
Subject: [PATCH 21/25] Bump oj from 3.7.12 to 3.8.0

Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d90e7fc2b..64bd00aea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -315,7 +315,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.7.12)
+    oj (3.8.0)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)

From f0ec15805359b3a16bb5f06105f0b4526fad6c92 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 07:15:47 +0000
Subject: [PATCH 22/25] Bump webdrivers from 4.1.0 to 4.1.1

Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 64bd00aea..0ed34529c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -511,7 +511,7 @@ GEM
     uniform_notifier (1.12.1)
     warden (1.2.8)
       rack (>= 2.0.6)
-    webdrivers (4.1.0)
+    webdrivers (4.1.1)
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (>= 3.0, < 4.0)

From 93a171b1b2e2cfa3d3d4c9152b17a2fc411d0ec3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 21 Jul 2019 10:13:30 +1200
Subject: [PATCH 23/25] Create stale.yml

---
 .github/stale.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..e8f757af5
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 120
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

From 724cac959b934f3a8bc3a12832cb2c97b5d5a571 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2019 08:19:24 +0000
Subject: [PATCH 24/25] Bump rake from 12.3.2 to 12.3.3

Bumps [rake](https://github.com/ruby/rake) from 12.3.2 to 12.3.3.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.2...v12.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0ed34529c..c1ae914d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -394,7 +394,7 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)

From c198b7f4466739dd1d60deff74a487cd5388661a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2019 07:15:14 +0000
Subject: [PATCH 25/25] Bump rubocop-rspec from 1.33.0 to 1.34.0

Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.33.0...v1.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c1ae914d9..e0d8d48d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -434,7 +434,7 @@ GEM
     rubocop-rails (2.2.1)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    rubocop-rspec (1.33.0)
+    rubocop-rspec (1.34.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
     ruby-units (2.3.1)