merging rails_6 with develop

.env.development

@@ -0,0 +1,20 @@
+# Generated with gabsocial:setup on 2021-01-26 17:34:03 UTC
+
+LOCAL_DOMAIN=localhost
+SINGLE_USER_MODE=false
+SECRET_KEY_BASE=aa97516571e4cda8d27316788bf4a97c484744cb5fbd6d272389c4e6c675f0b40243073ba5cd606f8a0b39cc34c237fa3d66ef1e4a973c0db08ee56f51e70703
+OTP_SECRET=6bf15ce12656771ef4ca95ed86e6a31e2bc1975a1dc3e2387d951b733f5d1f34afd89d4061ca174946080420d37be9b51a207e5d54f8f4631b00ebfc8ef35f3c
+VAPID_PRIVATE_KEY=3wqpDPa06BhXMDQB6kQQIMP-0iiCLMH8DfbvSxmXADc=
+VAPID_PUBLIC_KEY=BH1-GnuLJLOb_CKzeeSr2oPF05yeNXUyZ5oO2YOS6lJYfFeyG8mGdX_ZCWwKDgfUhwaEWr-mCZJoa7KBBZY-_Ds=
+DB_HOST=localhost
+DB_PORT=5433
+DB_NAME=postgres
+DB_USER=postgres
+#DB_PASS=
+REDIS_HOST=localhost
+REDIS_PORT=6379
+SMTP_SERVER=localhost
+SMTP_PORT=25
+SMTP_AUTH_METHOD=none
+SMTP_OPENSSL_VERIFY_MODE=none
+SMTP_FROM_ADDRESS=Gab Social <noreply@desk.local>

migrations.sql

@@ -0,0 +1,311 @@
+insert into schema_migrations (version) values (
+20160220174730),
+(20160220211917),
+(20160221003140),
+(20160221003621),
+(20160222122600),
+(20160222143943),
+(20160223162837),
+(20160223164502),
+(20160223165723),
+(20160223165855),
+(20160223171800),
+(20160224223247),
+(20160227230233),
+(20160305115639),
+(20160306172223),
+(20160312193225),
+(20160314164231),
+(20160316103650),
+(20160322193748),
+(20160325130944),
+(20160826155805),
+(20160905150353),
+(20160919221059),
+(20160920003904),
+(20160926213048),
+(20161003142332),
+(20161003145426),
+(20161006213403),
+(20161009120834),
+(20161027172456),
+(20161104173623),
+(20161105130633),
+(20161116162355),
+(20161119211120),
+(20161122163057),
+(20161123093447),
+(20161128103007),
+(20161130142058),
+(20161130185319),
+(20161202132159),
+(20161203164520),
+(20161205214545),
+(20161221152630),
+(20161222201034),
+(20161222204147),
+(20170105224407),
+(20170109120109),
+(20170112154826),
+(20170114194937),
+(20170114203041),
+(20170119214911),
+(20170123162658),
+(20170123203248),
+(20170125145934),
+(20170127165745),
+(20170129000348),
+(20170205175257),
+(20170209184350),
+(20170214110202),
+(20170217012631),
+(20170301222600),
+(20170303212857),
+(20170304202101),
+(20170317193015),
+(20170318214217),
+(20170322021028),
+(20170322143850),
+(20170322162804),
+(20170330021336),
+(20170330163835),
+(20170330164118),
+(20170403172249),
+(20170405112956),
+(20170406215816),
+(20170409170753),
+(20170414080609),
+(20170414132105),
+(20170418160728),
+(20170423005413),
+(20170424003227),
+(20170424112722),
+(20170425131920),
+(20170425202925),
+(20170427011934),
+(20170506235850),
+(20170507000211),
+(20170507141759),
+(20170508230434),
+(20170516072309),
+(20170520145338),
+(20170601210557),
+(20170604144747),
+(20170606113804),
+(20170609145826),
+(20170610000000),
+(20170623152212),
+(20170624134742),
+(20170625140443),
+(20170711225116),
+(20170713112503),
+(20170713175513),
+(20170713190709),
+(20170714184731),
+(20170716191202),
+(20170718211102),
+(20170720000000),
+(20170823162448),
+(20170824103029),
+(20170829215220),
+(20170901141119),
+(20170901142658),
+(20170905044538),
+(20170905165803),
+(20170913000752),
+(20170917153509),
+(20170918125918),
+(20170920024819),
+(20170920032311),
+(20170924022025),
+(20170927215609),
+(20170928082043),
+(20171005102658),
+(20171005171936),
+(20171006142024),
+(20171010023049),
+(20171010025614),
+(20171020084748),
+(20171028221157),
+(20171107143332),
+(20171107143624),
+(20171109012327),
+(20171114080328),
+(20171114231651),
+(20171116161857),
+(20171118012443),
+(20171119172437),
+(20171122120436),
+(20171125024930),
+(20171125031751),
+(20171125185353),
+(20171125190735),
+(20171129172043),
+(20171130000000),
+(20171201000000),
+(20171212195226),
+(20171226094803),
+(20180106000232),
+(20180109143959),
+(20180204034416),
+(20180206000000),
+(20180211015820),
+(20180304013859),
+(20180310000000),
+(20180402031200),
+(20180402040909),
+(20180410204633),
+(20180416210259),
+(20180506221944),
+(20180510214435),
+(20180510230049),
+(20180514130000),
+(20180514140000),
+(20180528141303),
+(20180608213548),
+(20180609104432),
+(20180615122121),
+(20180616192031),
+(20180617162849),
+(20180628181026),
+(20180707154237),
+(20180711152640),
+(20180808175627),
+(20180812123222),
+(20180812162710),
+(20180812173710),
+(20180813113448),
+(20180814171349),
+(20180820232245),
+(20180929222014),
+(20181007025445),
+(20181010141500),
+(20181017170937),
+(20181018205649),
+(20181024224956),
+(20181026034033),
+(20181116165755),
+(20181116173541),
+(20181116184611),
+(20181127130500),
+(20181203003808),
+(20181203021853),
+(20181204193439),
+(20181204215309),
+(20181207011115),
+(20181213184704),
+(20181213185533),
+(20181219235220),
+(20181226021420),
+(20190103124649),
+(20190103124754),
+(20190117114553),
+(20190201012802),
+(20190203180359),
+(20190225031541),
+(20190225031625),
+(20190226003449),
+(20190304152020),
+(20190306145741),
+(20190307234537),
+(20190314181829),
+(20190316190352),
+(20190317135723),
+(20190409054914),
+(20190420025523),
+(20190509164208),
+(20190510222844),
+(20190510231315),
+(20190511134027),
+(20190511152737),
+(20190512160135),
+(20190512225945),
+(20190514225311),
+(20190515001947),
+(20190519130537),
+(20190526171044),
+(20190529143559),
+(20190603162444),
+(20190603163444),
+(20190607000211),
+(20190716173227),
+(20190721214831),
+(20190721234917),
+(20190722003541),
+(20190722003649),
+(20190804115634),
+(20190903162122),
+(20190917135359),
+(20190917141707),
+(20191201204843),
+(20191201205006),
+(20191201210057),
+(20191202004114),
+(20200310223351),
+(20200310224203),
+(20200420223346),
+(20200430154012),
+(20200510034822),
+(20200707212650),
+(20200707212832),
+(20200707212951),
+(20200710130615),
+(20200721215336),
+(20200722190627),
+(20200722190844),
+(20200727224633),
+(20200801023407),
+(20200801023430),
+(20200801023518),
+(20200806162649),
+(20200806174026),
+(20200806231714),
+(20200808170254),
+(20200808170708),
+(20200901165533),
+(20200908210102),
+(20200908210103),
+(20200908210104),
+(20201109233203),
+(20201109233204),
+(20201109233205),
+(20201109233206),
+(20201109233207),
+(20201109233208),
+(20201109233209),
+(20201109233210),
+(20201109233211),
+(20201109233212),
+(20201109233213),
+(20201109233214),
+(20201109233215),
+(20201127051070),
+(20201127051071),
+(20201127051072),
+(20201127051073),
+(20201127051074),
+(20201130171423),
+(20201203211403),
+(20201203211419),
+(20201203211614),
+(20201203213059),
+(20201203213108),
+(20201203214600),
+(20201206060226),
+(20201212154128),
+(20201214051317),
+(20201214051720),
+(20201214054428),
+(20201214055039),
+(20201215203113),
+(20201216045306),
+(20201216051551),
+(20201217003945),
+(20201218012018),
+(20201222040559),
+(20210102225500),
+(20210103150000),
+(20210108123456),
+(20210117111000),
+(20210117120100),
+(20210117210100);