github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 22:33:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
39,047 Commits 214 Branches 500 Tags 960 MiB
aae97457d2
Commit Graph

4 Commits

Author SHA1 Message Date
Robin Ward
aae97457d2
REFACTOR: Don't use layoutName in select-kit (#10556) 
Instead import the templates as modules, the way Ember CLI wants us to.
 2020-08-28 15:30:20 -04:00
Michael Brown
d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 
This reverts commit 20780a1eee.

* 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 e62a85cf6f, reversing
changes made to 2660c2e21d.
 2020-05-22 20:25:56 -07:00
Robin Ward
09ca75d17e FIX: select-kit was in the wrong place 
`app/` means we want to merge it into our application there. `addon`
means give it its own module namespace, which is what we wanted.
 2020-05-20 11:51:49 -04:00