nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2016-05-05 17:59:51 +02:00
commit 2263abdc82
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -145,6 +145,7 @@ Contributions are very welcome, the hard work is done!
# 0.5.9.0 # 0.5.9.0
## Refactor ## Refactor
* Remove unused mentions regex [#6810](https://github.com/diaspora/diaspora/pull/6810)
## Bug fixes ## Bug fixes
* Fix back to top button not appearing on Webkit browsers [#6782](https://github.com/diaspora/diaspora/pull/6782) * Fix back to top button not appearing on Webkit browsers [#6782](https://github.com/diaspora/diaspora/pull/6782)

2
app/models/mention.rb
View file

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