From b16915d166d441c2aee162be07dc84934b28cfcd Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 4 Sep 2020 13:29:51 -0600
Subject: [PATCH] DEV: Switch over to a fork of ember-rails

We are switching over to a fork because we are currently on a pinned
version of ember-rails 0.18.5 which is pretty old. Upgrading to the
latest version causes many things to break which isn't really worth the
time to debug while we plan to completely switch over to ember-cli
somewhat soonish. Our fork contains a single cherry-pick commit

https://github.com/emberjs/ember-rails/pull/534

which will fix an issue when running the `rails g migration` command and
it spits out a bunch of deprecation warnings.
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8baf3db839f..4112226c23c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'http_accept_language', require: false
 
 # Ember related gems need to be pinned cause they control client side
 # behavior, we will push these versions up when upgrading ember
-gem 'ember-rails', '0.18.5'
+gem 'discourse-ember-rails', '0.18.6', require: 'ember-rails'
 gem 'discourse-ember-source', '~> 3.12.2'
 gem 'ember-handlebars-template', '0.8.0'
 gem 'discourse-fonts'
diff --git a/Gemfile.lock b/Gemfile.lock
index cd3dce30551..bbc8d6ed969 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,6 +98,13 @@ GEM
     debug_inspector (0.0.3)
     diff-lcs (1.4.4)
     diffy (3.4.0)
+    discourse-ember-rails (0.18.6)
+      active_model_serializers
+      ember-data-source (>= 1.0.0.beta.5)
+      ember-handlebars-template (>= 0.1.1, < 1.0)
+      ember-source (>= 1.1.0)
+      jquery-rails (>= 1.0.17)
+      railties (>= 3.1)
     discourse-ember-source (3.12.2.2)
     discourse-fonts (0.0.3)
     discourse_image_optim (0.26.2)
@@ -113,13 +120,6 @@ GEM
     ember-handlebars-template (0.8.0)
       barber (>= 0.11.0)
       sprockets (>= 3.3, < 4.1)
-    ember-rails (0.18.5)
-      active_model_serializers
-      ember-data-source (>= 1.0.0.beta.5)
-      ember-handlebars-template (>= 0.1.1, < 1.0)
-      ember-source (>= 1.1.0)
-      jquery-rails (>= 1.0.17)
-      railties (>= 3.1)
     ember-source (2.18.2)
     erubi (1.9.0)
     excon (0.76.0)
@@ -457,12 +457,12 @@ DEPENDENCIES
   cppjieba_rb
   css_parser
   diffy
+  discourse-ember-rails (= 0.18.6)
   discourse-ember-source (~> 3.12.2)
   discourse-fonts
   discourse_image_optim
   email_reply_trimmer
   ember-handlebars-template (= 0.8.0)
-  ember-rails (= 0.18.5)
   excon
   execjs
   fabrication