4 commits

Author	SHA1	Message	Date
Bob Van Landuyt	b8ae15397f	Update migrations to move directly into the -/system folder	2017-08-11 18:15:02 +02:00
Bob Van Landuyt	f0f4506775	Don't update upload paths twice ... This will be done in 20170717150329_enqueue_migrate_system_uploads_to_new_folder.rb instead.	2017-08-11 18:15:02 +02:00
Robert Speicher	72a7b30c9f	Change all :empty_project to :project	2017-08-02 17:47:31 -04:00
DJ Mountney	1d1363e2bb	Bring in security changes from the 9.2.5 release ... Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue	2017-06-07 21:16:20 -07:00