Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 03:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,206 Commits 212 Branches 505 Tags
Commit Graph

6 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
Mark VanLandingham
bd57ae83f1
DEV: Guardian for hiding about stats (#9841) 2020-05-20 10:26:20 -05:00
Robin Ward
60df2ade8d Retry: Rename all test files from JS -> ES6 2020-03-26 12:25:46 -04:00
Robin Ward
4fa580fbd1 Revert "Rename all test files from JS -> ES6" 
This reverts commit 2abe85b8344de1102c1589a9ac9421a8b296f2b5.
 2020-03-25 16:13:43 -04:00
Robin Ward
2abe85b834 Rename all test files from JS -> ES6 2020-03-25 15:03:21 -04:00