Merge branch 'stable' into develop

diaspora · May 5, 2016 · 2263abd · 2263abd
2 parents 05d632d + ce6b1a3
commit 2263abd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -145,6 +145,7 @@ Contributions are very welcome, the hard work is done!
 # 0.5.9.0
 
 ## Refactor
+* Remove unused mentions regex [#6810](https://github.com/diaspora/diaspora/pull/6810)
 
 ## Bug fixes
 * Fix back to top button not appearing on Webkit browsers [#6782](https://github.com/diaspora/diaspora/pull/6782)

diff --git a/app/models/mention.rb b/app/models/mention.rb
@@ -3,8 +3,6 @@
 #   the COPYRIGHT file.
 
 class Mention < ActiveRecord::Base
-  REGEX = /@\{([^;]+); ([^\}]+)\}/
-
   belongs_to :post
   belongs_to :person
   validates :post, :presence => true