Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-08 20:34:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,864 Commits 211 Branches 505 Tags
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Brown
d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 
This reverts commit 20780a1eeed56b321daf18ee6bbfe681a51d1bf4.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
 2020-05-23 00:56:13 -04:00
Jeff Atwood
20780a1eee Revert "Merge branch 'master' of https://github.com/discourse/discourse" 
This reverts commit e62a85cf6fd81a2a34aff6144bd36b9ac459964a, reversing
changes made to 2660c2e21d84bea667e1ea339f91cda352328062.
 2020-05-22 20:25:56 -07:00
Martin Brennan
e334133294
PERF: Remove foreign keys from bookmarks (#9837) 
As a general rule we do not add FKs in Discourse and instead rely on consistency checks at weekly/daily intervals
 2020-05-20 10:45:49 +10:00