mirror of
https://github.com/discourse/discourse.git
synced 2025-09-06 09:10:25 +08:00
Merge branch 'master' into search_posts_by_filetype
This commit is contained in:
commit
d8c27e3871
18042 changed files with 120300 additions and 33700 deletions
|
@ -29,7 +29,7 @@ describe Upload do
|
|||
context ".create_thumbnail!" do
|
||||
|
||||
it "does not create a thumbnail when disabled" do
|
||||
SiteSetting.stubs(:create_thumbnails?).returns(false)
|
||||
SiteSetting.create_thumbnails = false
|
||||
OptimizedImage.expects(:create_for).never
|
||||
upload.create_thumbnail!(100, 100)
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue