Merge branch 'fix-todos' into 'master'

Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141

Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
00a19f32 · Douglas Barbosa Alexandre · 48fc02d2 · b100a9f2 · 00a19f32 · 00a19f32
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,10 @@ v 8.6.0 (unreleased)
  - Add main language of a project in the list of projects (Tiago Botelho)
  - Add ability to show archived projects on dashboard, explore and group pages

+v 8.5.5
+  - Ensure removing a project removes associated Todo entries.
+  - Prevent a 500 error in Todos when author was removed.
+
 v 8.5.4
  - Do not cache requests for badges (including builds badge)


--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -72,7 +72,7 @@ def avatar_icon(user_or_email = nil, size = nil, scale = 2)
    if user_or_email.is_a?(User)
      user = user_or_email
    else
-      user = User.find_by(email: user_or_email.downcase)
+      user = User.find_by(email: user_or_email.try(:downcase))
    end

    if user

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -151,6 +151,7 @@ def update_forks_visibility_level
  has_many :releases, dependent: :destroy
  has_many :lfs_objects_projects, dependent: :destroy
  has_many :lfs_objects, through: :lfs_objects_projects
+  has_many :todos, dependent: :destroy

  has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"


--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -4,7 +4,10 @@

    .todo-title
      %span.author-name
-        = link_to_author todo
+        - if todo.author
+          = link_to_author(todo)
+        - else
+          (removed)
      %span.todo-label
        = todo_action_name(todo)
        = todo_target_link(todo)

--- a/db/migrate/20160309140734_fix_todos.rb
+++ b/db/migrate/20160309140734_fix_todos.rb
+class FixTodos < ActiveRecord::Migration
+ def up
+    execute <<-SQL
+      DELETE FROM todos
+      WHERE todos.target_type IN ('Commit', 'ProjectSnippet')
+         OR NOT EXISTS (
+              SELECT *
+              FROM projects
+              WHERE projects.id = todos.project_id
+            )
+    SQL
+ end
+
+ def down
+ end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 20160305220806) do
+ActiveRecord::Schema.define(version: 20160309140734) do

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"

--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -68,6 +68,7 @@
    it { is_expected.to have_many(:runners) }
    it { is_expected.to have_many(:variables) }
    it { is_expected.to have_many(:triggers) }
+    it { is_expected.to have_many(:todos).dependent(:destroy) }
  end

  describe 'modules' do