1
0
Fork 0

Commit Graph

  • 47f9965a95 March 2021 develop Mentally Ill Tranny Demon Hacker 2021-03-02 10:56:27 +0100
  • 74b3700f58 Merge branch 'improve_home_feed_query' into 'develop' admin 2021-03-01 01:58:36 +0000
  • 3b704cec7d Use a constant rubic0n 2021-02-28 19:50:01 -0600
  • 6e42e3b1ec Improve home feed query rubic0n 2021-02-28 19:45:44 -0600
  • fa8b6a3377 Removed account search_for in Account.rb model Developer 2021-02-28 20:19:58 -0500
  • 35276edde1 Merge branch 'fix_preview_card_search' into 'develop' Developer 2021-03-01 00:26:46 +0000
  • ea3e126579 Fixed issue with Notification status url 'to' value Developer 2021-02-28 19:24:42 -0500
  • 0839160efd Address issue with notifications page. Fosco Marotto 2021-02-28 19:14:36 -0500
  • 444f9a156b Partial revert 3f90b0be Developer 2021-02-28 18:09:36 -0500
  • 8a329b67a5 Fix preview card search rubic0n 2021-02-28 15:33:38 -0600
  • 10ec03f28b Removed GroupsController search by tag, category Developer 2021-02-26 17:45:48 -0500
  • f1cc618fdd Updated reports page to be more mobile friendly Developer 2021-02-26 13:14:06 -0500
  • 3f90b0be69 Updated all instances of request.remote_ip to use new ip headers Developer 2021-02-26 12:50:25 -0500
  • 4d43158fe2 Updated NotificationsPage to reset to 'all' every time page loads Developer 2021-02-25 11:06:42 -0500
  • 573fdbc981 Fixed issue with MediaModal causing page to scroll to top on open Developer 2021-02-25 11:02:45 -0500
  • 444263a8b2 Updated Notification timestamp to link to status/mention/comment Developer 2021-02-25 10:40:52 -0500
  • 0c1d84262f Add missing uri attribute in StatusSerializer Developer 2021-02-25 10:37:50 -0500
  • c7b17c5bde Add missing icons Fosco Marotto 2021-02-25 10:13:19 -0500
  • a72be3b45b Add missing apple icons Fosco Marotto 2021-02-25 10:09:36 -0500
  • 71b428e348 Added checks in emails regarding GabPRO if email is confirmed and allows GabPRO emails Developer 2021-02-23 13:31:00 -0500
  • 4b8df32371 Added opt-out/unsubscribe links at bottom of all emails Developer 2021-02-23 13:30:28 -0500
  • 8deb255593 Added new email opt out for GabPRO reminders/introducing Developer 2021-02-23 13:30:04 -0500
  • 16b053b72d Update list_controller.rb admin 2021-02-21 04:40:32 +0000
  • a2793f04d6 Revert "Updated BaseController to return false if doorkeeper_token nil for superapp" Fosco Marotto 2021-02-20 22:25:59 -0500
  • fde3821450 Merge branch 'feature/Username_Search_Case' into 'develop' Free Speech Forever 2021-02-20 13:11:47 +0000
  • 4fcae80457 Feature/username search case azuregc7 2021-02-20 13:11:47 +0000
  • 1a7c34724e Merge branch 'fix/confirmations' of https://code.gab.com/gab/social/gab-social into develop Fosco Marotto 2021-02-19 22:58:23 -0500
  • 285cccdb83 Removed unused AppsController, apps routes Developer 2021-02-19 22:32:20 -0500
  • e5ea8fb487 Updated BaseController to return false if doorkeeper_token nil for superapp Developer 2021-02-19 22:23:36 -0500
  • 58a8a17bfe Updated ConfirmationsController to set new email after confirmation to unconfirmed email only Developer 2021-02-19 21:57:09 -0500
  • c01328c8a0 Add require_unconfirmed to the confirmations controller Fosco Marotto 2021-02-19 21:29:07 -0500
  • f1a857a7b4 Added created date to reports page for each report Developer 2021-02-19 12:38:13 -0500
  • 32ac987ef0 Updated SuspendAccountService to resolve outstanding reports on suspend Developer 2021-02-19 12:31:52 -0500
  • b7d6d5f18c Removed validation on spam_field for int in Account model Developer 2021-02-19 12:31:06 -0500
  • 187eb5ae78 Updated elapsed registration_form_time to 5 seconds Developer 2021-02-19 12:30:46 -0500
  • d7271b899f Fixed issue with account.rb for spam_flag to include nil by default Developer 2021-02-19 11:05:30 -0500
  • 4acf7f0bce Limit the user and session tracking concerns to the home timeline Fosco Marotto 2021-02-19 09:50:59 -0500
  • da522f8841 Added check in PostStatusService for limited posting functionality to users with unconfirmed emails Developer 2021-02-19 00:08:23 -0500
  • 2a8ca2cd56 Added new spam_flag to Accounts, replacing is_flagged_as_spam Developer 2021-02-18 23:46:53 -0500
  • bf1d00b5f8 Added new follow limit for unconfirmed accounts to 10 Developer 2021-02-18 23:18:16 -0500
  • c18bcf2b21 Added check to RegistrationsController for checking if form was submitted too quickly Developer 2021-02-18 21:35:09 -0500
  • 5149c613f2 Added StatusSimilarityService to check against spamming same statuses over and over Developer 2021-02-18 20:12:40 -0500
  • a955c51eb6 Added similar_text gem Developer 2021-02-18 20:11:39 -0500
  • 00e6d799e8 Fixed AddIsFlaggedAsSpamToAccounts migration down removal value Developer 2021-02-18 23:21:09 +0000
  • bec3360b66 Added checks in ModalBase, PopoverBase if page goes back/forward to dismiss Developer 2021-02-18 17:22:11 -0500
  • 7000902ecb Added check for if node exists before handleKeyDown on PopoverBase Developer 2021-02-18 17:21:02 -0500
  • c85ad3e92a Updated account_flags_block to only be visible for staff Developer 2021-02-18 17:01:25 -0500
  • fea1b9389b Add a writing role to the shortcuts controller Fosco Marotto 2021-02-18 16:57:34 -0500
  • be5fc25544 Added missing account flags in admin group moderator list Developer 2021-02-18 16:50:17 -0500
  • fa74c34095 Added account_flags_block partial to admin pages Developer 2021-02-18 16:49:14 -0500
  • c7df309df5 Added total report count to admin reports page Developer 2021-02-18 16:44:49 -0500
  • 84ba247982 Added (temporary) fix for spam bots statuses to be hidden from timelines, comments Developer 2021-02-18 16:25:07 -0500
  • e8f50b7ad5 Added check in Comment to see if data exists before rendering Developer 2021-02-18 16:24:06 -0500
  • 4696307cc9 Use a writing role for some sidekiq worker reads Fosco Marotto 2021-02-18 15:02:16 -0500
  • de7d71e0ee Updated SignUpLogInPanel login/signup buttons to match nav and injection auth buttons Developer 2021-02-18 13:41:37 -0500
  • 6421b632b0 Updated LoggedOutNavigationBar log in button background color Developer 2021-02-18 13:39:16 -0500
  • 65949c7e71 Removed ImageProxyController API route Developer 2021-02-18 13:34:08 -0500
  • 559ccc7e51 Merge branch 'performance_boosts' into 'develop' Free Speech Forever 2021-02-18 07:09:28 +0000
  • 44fd00bdc0 Remove an unnecessary `if` rubic0n 2021-02-18 00:54:51 -0600
  • 9b17b0a553 Reduce array allocations by using a constant rubic0n 2021-02-18 00:54:29 -0600
  • b1445d09b6 Remove 40KB of allocations (4,100 objects) from home feed rubic0n 2021-02-18 00:45:21 -0600
  • 006322cff7 Remove Hash allocation rubic0n 2021-02-18 00:35:31 -0600
  • a623252c59 Convert to boolean in C code rubic0n 2021-02-17 23:25:10 -0600
  • 0c7019f1e8 Add Benchmark IPS gem, to A/B test code rubic0n 2021-02-17 23:24:34 -0600
  • 6b7ece9123 Add a nil check during require_user Fosco Marotto 2021-02-17 00:20:06 -0500
  • 8d3d7efe34 Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop Fosco Marotto 2021-02-16 16:04:25 -0500
  • 9666472105 Wrap user confirm method with writing role Fosco Marotto 2021-02-16 16:04:11 -0500
  • 88d8bd2816 Merge remote-tracking branch 'origin/load_rails_6_0_defaults' into develop Fosco Marotto 2021-02-16 15:10:01 -0500
  • cb6e06c285 Merge branch 'feature/remove_keypair' into 'develop' Free Speech Forever 2021-02-16 18:54:37 +0000
  • 5793d2aa33 remove local monkeypatch admin 2021-02-16 13:43:09 -0500
  • 69f3cf08c9 fixed app/controllers/concerns/signature_verification.rb admin 2021-02-16 13:41:49 -0500
  • 5d9750fa25 forgot to push these changes admin 2021-02-16 13:35:19 -0500
  • e942d3d97c removed rsa keypair from account table, it was a federation relic admin 2021-02-15 21:49:50 -0500
  • 5d1a40d936 Added CharacterCounter to ComposeDestinationHeader mgabdev 2021-02-15 21:47:56 -0500
  • 0456ccfb2a Added missing fillSecondary class mgabdev 2021-02-15 21:00:43 -0500
  • 0edaaa95d7 Fixed issue with Following/Followers scrolling to top on infinite scroll pagination mgabdev 2021-02-15 20:48:19 -0500
  • d91df58eb9 Remove stray } from api.js Fosco Marotto 2021-02-15 19:59:02 -0500
  • 422a599831 Merge branch 'test/devise-fork' into 'develop' Free Speech Forever 2021-02-15 23:26:00 +0000
  • 92c9092abd Avoid redundant OAuth queries when not signed in Free Speech Forever 2021-02-15 23:26:00 +0000
  • 7bfe6c7709 More writing role changes in sessions controller Fosco Marotto 2021-02-14 23:21:53 -0500
  • 5e7cec5345 Change logout deletion method. Fosco Marotto 2021-02-14 21:26:48 -0500
  • dd8c656dd5 Merge branch 'puma_5_2' into 'develop' Free Speech Forever 2021-02-15 01:12:32 +0000
  • 2b563148a8 Merge branch 'development_updates' into 'develop' Free Speech Forever 2021-02-15 01:11:39 +0000
  • 0f85ba2f12 Change the oauth authorizations controller writing role method. Fosco Marotto 2021-02-14 15:52:38 -0500
  • 0d5acfc3fb Update push subscription writing role Fosco Marotto 2021-02-14 14:10:25 -0500
  • 09ba5c9be8 Fix settings application controller writing role Fosco Marotto 2021-02-14 14:05:03 -0500
  • 73c0e50936 Prevent constant ElasticAPM warnings in development by disabling it rubic0n 2021-02-13 23:02:44 -0600
  • f472a6154e Mark the replicas as replicas rubic0n 2021-02-13 22:59:02 -0600
  • 903b6c7969 Simplify database.yml by merging in default options rubic0n 2021-02-13 22:51:23 -0600
  • 70c44fc68d Fix vagrant now that Rails 6 replicas are being used rubic0n 2021-02-13 22:49:29 -0600
  • 6221581cf0 Create script to generate dummy data, for perf investigation rubic0n 2021-02-03 01:06:42 -0600
  • 1179957a32 Start redis server on VM boot rubic0n 2021-02-03 00:48:40 -0600
  • 9331f06784 Add rack-mini-profiler, to diagnose perf issues rubic0n 2021-02-03 00:48:19 -0600
  • 0341cd8572 Updated RegistrationsController captcha values Developer 2021-02-13 13:31:57 -0500
  • 7a2594e105 Add writing role for some moderation classes, update verification method. Fosco Marotto 2021-02-11 18:34:04 -0500
  • 5a5150757e Added spam, other account flags to reports page table list items Developer 2021-02-11 14:38:41 -0500
  • 2548205487 Updated ReportService to not create new reports if account is already suspended Developer 2021-02-11 14:30:37 -0500
  • 4bb2f1b745 Verification requests should use the writing role Fosco Marotto 2021-02-11 01:18:36 -0500
  • 538bcf21c9 Updated registration page username to disallow unallowed characters Developer 2021-02-11 00:57:48 -0500
  • 8a2f34d815 Added check in RegistrationsController to ensure email and password don't match Developer 2021-02-11 00:33:28 -0500
  • 39a3d44bdd Updated all admin moderation links from app popover menus to open in new tab Developer 2021-02-11 00:23:20 -0500
  • b636f36871 Added prop for openInNewTab in ListItem for Button links Developer 2021-02-11 00:21:44 -0500
  • 2fff6b3046 Fixed issue with empty featured group in FeaturedGroupsInjection Developer 2021-02-11 00:17:56 -0500
  • f56d177b9b Added ability to copy g/ group link in GroupHeader to clipboard Developer 2021-02-11 00:16:43 -0500
  • e3af1b4a26 Updated LinkBlock checks for if status text contains blocked domain mgabdev 2021-02-11 00:01:45 -0500
  • d73b4afa28 Updated random int function to use helper numbers util in ws stream.js mgabdev 2021-02-10 23:21:35 -0500
  • 72162affcf Updated stream ws to close if backend api error mgabdev 2021-02-10 23:08:00 -0500
  • a42b7797d8 Updated websocket.js to @gamestdio/websocket Developer 2021-02-10 20:11:18 -0500
  • 488a362129 Updated labels and hints in user registration form Developer 2021-02-10 13:48:13 -0500
  • 8b8f73deb1 Added back account autofill mention in composer Developer 2021-02-10 13:29:48 -0500
  • 4490070aa2 Updated Verification Requests page to include account display name Developer 2021-02-10 12:59:30 -0500
  • 59484da4dc Updated FetchGroupsService to fetch featured groups that are not private and visible Developer 2021-02-10 12:43:23 -0500
  • 3e9e32b276 Updated lists to make account search work Developer 2021-02-10 12:41:41 -0500
  • ab2521b880 Fixed issue with search icon in the search bar submitting the search Developer 2021-02-10 12:34:44 -0500
  • 05cfd3e06d Updated @clusterws/cws node package to latest version (3.0.0) Developer 2021-02-10 12:26:17 -0500
  • 578da9faae Updated node engine value to >=10.13 Developer 2021-02-10 12:25:29 -0500
  • 30c05a6e96 Added new flags to admin dashboard account search Developer 2021-02-10 12:24:09 -0500
  • 65d8c7ee86 Possible fix for home timeline Fosco Marotto 2021-02-10 11:02:54 -0500
  • cacfb6e7ba Possible doorkeeper fix Fosco Marotto 2021-02-10 00:41:25 -0500
  • a1a97bb483 Revert "Merge branch 'features/null_bearer2' into 'develop'" Fosco Marotto 2021-02-09 23:58:00 -0500
  • ad35c7fa72 Revert "Merge branch 'fix_null_bearer' into 'develop'" Fosco Marotto 2021-02-09 23:57:16 -0500
  • c14fc2fa9d Merge branch 'features/null_bearer2' into 'develop' Free Speech Forever 2021-02-10 03:34:35 +0000
  • 22c3fa995d Merge branch 'fix_null_bearer' into 'develop' Free Speech Forever 2021-02-10 03:33:16 +0000
  • 3931ba4f81 Merge branch 'feature/worker-updates' into 'develop' Free Speech Forever 2021-02-10 03:32:48 +0000
  • 729c00a5a9 Bundle of corrections and one doorkeeper writing role change Fosco Marotto 2021-02-09 22:32:24 -0500
  • 382fd31ec7 Update database.yml admin 2021-02-09 19:41:12 +0000
  • 669b378c6f Merge branch 'features/db-fun' into 'develop' admin 2021-02-09 19:38:10 +0000
  • 473c48b2aa Replace Makara with an initial Rails 6 role based splitting method. Free Speech Forever 2021-02-09 19:38:10 +0000
  • ae036995bf Fix authorization header when no access token Fosco Marotto 2021-02-09 11:16:04 -0500
  • 57a88c5904 Avoid redundant OAuth queries when not signed in rubic0n 2021-02-06 22:41:35 -0600
  • 31922ea58b Merge branch 'feature/home_feed4' into 'develop' admin 2021-02-06 18:33:23 +0000
  • e1a8d158d6 [home] Changed sort back to created_ad after adding new index to accounts azuregc7 2021-02-06 09:48:18 -0800
  • 2baebbab18 [home] Changed sort back to created_ad after adding new index to accounts azuregc7 2021-02-06 09:45:34 -0800
  • dd6cbd0c17 Reduce home feed statuses per batch to 10 azuregc7 2021-02-05 15:58:01 -0800
  • a43a7af771 Some worker updates. Fosco Marotto 2021-02-05 13:25:46 -0500
  • c45d8adbf2 Another group collection controller sort change. Fosco Marotto 2021-02-05 00:12:51 -0500
  • 5b89095a55 Switch group collection view back to newest sorting. Fosco Marotto 2021-02-04 23:57:03 -0500
  • fdca30cd97 Move Link Crawler to different queue Fosco Marotto 2021-02-04 18:09:04 -0500
  • 5f939abfbe [home] Home feed optimizations, sorting azuregc7 2021-02-04 12:02:51 -0800
  • 22b7b2ab8b Disable unused DistributionWorker and activity:interactions Fosco Marotto 2021-02-04 13:48:50 -0500
  • 34a888ca10 Change weighting for top_order Fosco Marotto 2021-02-04 12:37:01 -0500
  • b705c82304 Update mention_html formatter again. Fosco Marotto 2021-02-03 13:26:32 -0500
  • 8d9db14121 Revert "Remove local checks from formatter" Fosco Marotto 2021-02-03 13:14:22 -0500
  • e4a214a0c4 Revert "deleted unneccessary looping queries in EntityCache" Fosco Marotto 2021-02-03 13:13:29 -0500
  • c30f600f09 Remove local checks from formatter Fosco Marotto 2021-02-03 13:07:37 -0500
  • 1def861fa0 Merge branch 'feature/entity-cache-fix' into 'develop' admin 2021-02-03 17:00:52 +0000
  • fa9f0ce6f3 Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop admin 2021-02-03 11:56:36 -0500
  • d20330f391 deleted unneccessary looping queries in EntityCache admin 2021-02-03 11:56:22 -0500
  • 584482f325 Fix explore page correctly. Fosco Marotto 2021-02-03 11:55:57 -0500
  • 4e0605165d Fix explore page. Fosco Marotto 2021-02-03 11:32:25 -0500
  • 7d8ecac125 Update elastic_apm.yml admin 2021-02-03 15:17:38 +0000
  • 6a620f388e Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop admin 2021-02-03 10:13:04 -0500
  • 80297c4d21 added elastic-apm to gemfile admin 2021-02-03 10:12:57 -0500
  • 82bdbbcb5f added elastic apm and fixed session updated_at bug admin 2021-02-03 10:12:05 -0500
  • dd8531237d Added filter in account moderation to for spam mgabdev 2021-02-03 00:58:58 -0500
  • 33f4bc4650 Added button to reset a spam bool on an account mgabdev 2021-02-02 21:11:48 -0500
  • e047a50967 Fixed issue with statuses moderation interface mgabdev 2021-02-02 20:49:01 -0500
  • b06afbcd4a [spam] Hide statuses from accounts marked as spam. Fosco Marotto 2021-02-02 15:17:04 -0500
  • 496f624c3a Updated IP in captcha mgabdev 2021-02-02 14:20:27 -0500
  • 6b6cd76bb2 Merge branch 'feature/adding_sign_up_captcha' of https://code.gab.com/gab/social/gab-social into develop mgabdev 2021-02-02 12:01:15 -0500
  • e4527e5210 Remove scout apm Fosco Marotto 2021-02-01 15:04:16 -0500
  • 440a1ce6ff Minor changes to workers. Fosco Marotto 2021-02-01 03:43:56 -0500
  • 02bbe4304b Upgrade to Puma 5.2.0 (from 5.1.1) rubic0n 2021-02-01 00:00:43 -0600
  • 87c41ede7a Load Rails 6.0 defaults and remove 6.0 migration initializer rubic0n 2021-01-31 17:29:46 -0600
  • 8c018b8088 Don't autoload in initializers: SidekiqErrorHandler rubic0n 2021-01-31 17:24:37 -0600
  • 497ec0c1db Teach Zeitwerk that REST is the class name, not Rest rubic0n 2021-01-31 17:20:02 -0600
  • bee832d4ef Fix Zeitwerk load error for SanitizeConfig rubic0n 2021-01-31 17:11:02 -0600
  • 2b9144d50c Fix "NameError: uninitialized constant Exceptions" rubic0n 2021-01-31 17:06:45 -0600
  • f77fa3ca4a Fix autoloading in initialization rubic0n 2021-01-29 23:12:53 -0600
  • 2f95b0d67e Enable remaining settings rubic0n 2021-01-29 23:08:33 -0600
  • 48ba509234 Merge branch 'feature/homefeed_cte' of https://code.gab.com/gab/social/gab-social into feature/homefeed_cte azuregc7 2021-01-30 21:50:10 -0800
  • 738584c1b1 Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/homefeed_cte azuregc7 2021-01-30 21:47:10 -0800
  • b793f5f908 [home] Remove duplicate reposts from timeline feed, improve query performance, and increase batch size azuregc7 2021-01-30 20:24:57 -0800
  • 0b03e79889 [home] Remove duplicate reposts from timeline feed, improve query performance, and increase batch size azuregc7 2021-01-30 20:24:57 -0800
  • 58cc000b0f [scout] Monitor is off by default. Fosco Marotto 2021-01-30 22:45:23 -0500
  • 8b8e8ec8e5 [scout_apm] Add scout apm to Gemfile, add config file Fosco Marotto 2021-01-30 21:19:12 -0500
  • 3196dfbda9 Fix and re-enable user activity update Fosco Marotto 2021-01-30 01:49:22 -0500
  • 8b701c11e3 Re-enable session activity update Fosco Marotto 2021-01-30 01:38:43 -0500
  • 0587875a75 Fix current_resource_owner caching implementation Fosco Marotto 2021-01-30 01:27:11 -0500
  • c84e7e3451 [mark_read] first pass at quickly re-enabling this endpoint Fosco Marotto 2021-01-29 20:20:52 -0500
  • 75d041af77 Merge branch 'requested_messages_unnecessary_queries' into 'develop' Free Speech Forever 2021-01-29 05:09:04 +0000
  • 7a3cbe60ec [temp] Disable mark_read and some failing updates until they can be fixed. Fosco Marotto 2021-01-28 20:51:05 -0500
  • cf691f491c Update application_controller.rb admin 2021-01-28 21:12:29 +0000
  • d0b1f28430 Merge branch 'feature/rails_6' into 'develop' admin 2021-01-28 17:01:42 +0000
  • ef20054f47 Revert "merging rails_6 with develop" admin 2021-01-27 21:29:55 +0000
  • a417cdcde6 merging rails_6 with develop admin 2021-01-27 16:17:08 -0500
  • 87138932a0 Merge branch 'gab_provision' of https://code.gab.com/gab/social/gab-social into develop admin 2021-01-27 16:16:48 -0500
  • 05e95cf090 [session_activations] Stop needless updated_at changes Fosco Marotto 2021-01-27 16:08:39 -0500
  • 2b99918b26 Group admins can't leave by clicking 'member' button Fosco Marotto 2021-01-27 12:16:49 -0500
  • 3d06e94595 [fix] Logged out user session issue. Fosco Marotto 2021-01-27 00:24:54 -0500
  • 0120a2b361 Merge branch 'feature/session-cache' into 'develop' admin 2021-01-26 23:33:22 +0000
  • 132c46ac9a Session and user caching admin 2021-01-26 23:33:22 +0000
  • e9cc73857b Removed extra sign up button on registrations page mgabdev 2021-01-26 15:21:11 -0500
  • a3ef16bc8c Added captcha for sign up form mgabdev 2021-01-26 15:04:05 -0500
  • 21096c523d [streaming] disable chat endpoints. Fosco Marotto 2021-01-25 16:53:58 -0500
  • dcbbd51d2a Removing chat messages stream for now mgabdev 2021-01-25 16:38:22 -0500
  • 5600c94f5a Fixed issue with active icons in action bar for like, repost if no active user mgabdev 2021-01-25 16:01:55 -0500
  • 48ecd800cf Removed chat counters in admin account dashboard mgabdev 2021-01-25 16:00:49 -0500
  • 154aaecc5f Updated StatusFilter private scope functions mgabdev 2021-01-25 15:58:52 -0500
  • b4ba3c70ef Revert streaming removals 2c8b4f7fb, 574b45e04, 8313f4b11 mgabdev 2021-01-25 15:52:52 -0500