Merge branch 'master' into 'focus-mode-board'focus-mode-board

# Conflicts:
#   app/views/shared/issuable/_filter.html.haml

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
index f424186cf30..16e453bc328 100644
--- a/spec/features/issues/award_emoji_spec.rb
+++ b/spec/features/issues/award_emoji_spec.rb
@@ -17,8 +17,21 @@ describe 'Awards Emoji', feature: true do
       login_as(user)
     end
 
+    describe 'visiting an issue with a legacy award emoji that is not valid anymore' do
+      before do
+        # The `heart_tip` emoji is not valid anymore so we need to skip validation
+        issue.award_emoji.build(user: user, name: 'heart_tip').save!(validate: false)
+        visit namespace_project_issue_path(project.namespace, project, issue)
+      end
+
+      # Regression test: https://gitlab.com/gitlab-org/gitlab-ce/issues/29529
+      it 'does not shows a 500 page' do
+        expect(page).to have_text(issue.title)
+      end
+    end
+
     describe 'Click award emoji from issue#show' do
-      let!(:note) {  create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
+      let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
 
       before do
         visit namespace_project_issue_path(project.namespace, project, issue)