From 9b666115408b1c81dc958b25573c8ff1f2f35ad3 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 28 Jul 2020 10:50:51 -0500 Subject: [PATCH 1/3] Revert "Merge branch 'patch-1' into 'develop'" This reverts commit 20bfeb1db6cfc20a2d5a305d5c392c3dcf1e60e2, reversing changes made to 475881e80bb69cff2f3512987460b00de146453c. --- .../reducers/__tests__/compose-test.js | Bin 27287 -> 27861 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js index c3ebe7ded3fdb156ed5a30262bfaabfa7e8227ee..d5306aa338193c5e6e512e4d44dbd7001f3408ae 100644 GIT binary patch delta 308 zcmbu4u}T9$6h#S$#+T2a2OGI9S^wA3`M2S-cl9qiyM+0=IxNid-)g4EQ zwtMoap$O+KSs_6ZuYQd@H#g^w)BS~#a?=EmuaBnuVrKcfIK3=MyB?Fj-7oMCv1LW7 zHn-T6l==|z{Ol?h1y1&x{I)U=3+D&@u~wN9E45aJl0&qpRs8G6c3(O!skT8ddH*yY Fs~?nAank?* delta 26 icmcb5lX3c0#tkl_llkSPC$AILp1ecceKWtru@C@~iV7eA From 2aca716cfab5fc60dfbc4c99764707c88949386d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 28 Jul 2020 10:52:29 -0500 Subject: [PATCH 2/3] Revert "Merge branch 'decouple_spoiler_from_nsfw' into 'develop'" This reverts commit 03c2a8f29456f41eb6c1a1350fb8044c57b6693a, reversing changes made to b6c0884a1dacd86e5ae07f032f8601cb67dbad29. --- .../containers/sensitive_button_container.js | Bin 1648 -> 1769 bytes app/soapbox/reducers/compose.js | Bin 12884 -> 13083 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/containers/sensitive_button_container.js b/app/soapbox/features/compose/containers/sensitive_button_container.js index dc98de561f5b27d5908024075a56d7011f6189a5..3497c000933e504d730f2676fcc546cf89805dfe 100644 GIT binary patch delta 86 zcmeys^OAQ%DifE2LP}8838r>9z*~D delta 25 hcmaFK`+;XeD%0d?O!p^GW-i*y&(h4ec@wKSBLIyt37Y@_ diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js index c2e39e866da28c4e2736c8d38966ebfb500868e4..d9d554d4767e499ac324593acf50e8d40d687380 100644 GIT binary patch delta 172 zcmcbTGCOU95U;sLaYNoHB9x~4)+jRKO2;)49l zoYW$9&CU9}G2D_03YlpN8j6?-CO^~`pFEF`XYv9GDGmiNsO6d@t2J3uMPl+Fi5-*o xYjFeR#F-V;)F#j8RpC&uvsEzERH&XjQCoQOd_L~U{=D3iuj)u|J}ucP0RZ>OIKcn_ delta 88 zcmbQ8b|qzl5U)~kNn%N=UV3VYhI&eBT4HHVNqli?UU6ngW?8DbrlvwQ*W^Gcwaq2G rhTM}saB@zL<>i_DP(q5COF?1s1s?UuA5 Date: Tue, 28 Jul 2020 10:57:20 -0500 Subject: [PATCH 3/3] Update compose CW tests --- .../reducers/__tests__/compose-test.js | Bin 27861 -> 27679 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js index d5306aa338193c5e6e512e4d44dbd7001f3408ae..d063bc77ebca0c3495960083dca7929a85bca7da 100644 GIT binary patch delta 31 lcmcb5lX3nH#tkl_llkSPH?I?oWdt!MuM^eYyhB_z6ad6t3o-xz delta 201 zcmbP#gYoK3#tkl_KKlAWsk!-OsR|_-nZ*hvsl_D<`FY8y3dIHanK`LN3P8b>)a3lq zf}GS8g|wplT!q}kqU_APbcNj1l*~kh#A1cw)V$)%lFYKy&5okgj4As1t|^%%NamH~ hE9B*uC=?_X1Jy!}EiOqcNhRN=$&R9)o0-IALjjp@N!|be