Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""

Browse source 
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)
This commit is contained in:
Michael Brown 2020-05-23 00:56:13 -04:00
parent 20780a1eee
commit d9a02d1336
No known key found for this signature in database
GPG key ID: 6C07FB3007CF9360
236 changed files with 1031 additions and 715 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/discourse-loader.js
View file

@ -36,7 +36,6 @@ var define, requirejs;
default: Ember.Object,
get: Ember.get,
getProperties: Ember.getProperties,
guidFor: Ember.guidFor,
set: Ember.set,
setProperties: Ember.setProperties,
computed: Ember.computed,