Michael Kohl
bf8a7e3182
Remove fix-db-schema-conflicts gem ( #12432 )
2021-01-26 10:52:38 -05:00
narender2031
7a934a1565
Add Crayons classes to the "Destroy your account" page ( #12346 )
...
* add crayons classes
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* Update app/views/users/confirm_destroy.html.erb
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
* fix spec
Co-authored-by: ludwiczakpawel <ludwiczakpawel@gmail.com>
2021-01-26 16:28:37 +01:00
dependabot[bot]
20bf3883b6
Bump jbuilder from 2.10.1 to 2.11.1 ( #12406 )
...
Bumps [jbuilder](https://github.com/rails/jbuilder ) from 2.10.1 to 2.11.1.
- [Release notes](https://github.com/rails/jbuilder/releases )
- [Changelog](https://github.com/rails/jbuilder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jbuilder/compare/v2.10.1...v2.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 16:11:50 +01:00
Mac Siri
377439fea3
Disable ResaveArticlesForCodeSnippetFullscreenIcon ( #12431 )
2021-01-26 09:59:44 -05:00
dependabot[bot]
d950428029
Bump @storybook/addon-docs from 6.1.14 to 6.1.15 ( #12418 )
...
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs ) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/docs )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 14:23:04 +00:00
ludwiczakpawel
bf72758c4e
Close modal on escape keypress ( #12428 )
...
* tooltips 1.0.1
* tooltips 1.0.1
* close on esc
* simpler
2021-01-26 15:12:54 +01:00
ludwiczakpawel
6b0505dc47
Video max width ( #12436 )
...
* tooltips 1.0.1
* tooltips 1.0.1
* video width
* addding to supported attributes for markdown scrubber
2021-01-26 15:12:37 +01:00
dependabot[bot]
9787723bfc
Bump @storybook/addon-actions from 6.1.14 to 6.1.15 ( #12417 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/actions )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 10:29:39 +00:00
dependabot[bot]
ed92c75f5e
Bump @storybook/addon-storysource from 6.1.14 to 6.1.15 ( #12411 )
...
Bumps [@storybook/addon-storysource](https://github.com/storybookjs/storybook/tree/HEAD/addons/storysource ) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/storysource )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 10:21:21 +00:00
Michael Kohl
b4a480edae
Add validations to SiteConfig model ( #12341 )
...
* Move straightforward validations
* Add color contrast validation to SiteConfig
* Move domain and emoji validation to SiteConfig
* Add specs
* Update service object
* Experimentally remove validation
* Update spec
* Fix comment
2021-01-26 09:12:24 +07:00
dependabot[bot]
b02c36f929
Bump rack-attack from 6.3.1 to 6.4.0 ( #12408 )
...
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.3.1...v6.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 15:18:17 -05:00
dependabot[bot]
0e2bd76122
Bump sidekiq-unique-jobs from 7.0.0 to 7.0.1 ( #12416 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0...v7.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 14:59:55 -05:00
ludwiczakpawel
b8be2edb49
Offline page colors for dark theme ( #12423 )
2021-01-25 20:23:18 +01:00
rhymes
def0cf2437
Optimize column selection for articles belonging to "any" given tag ( #12420 )
...
When `acts-as-taggable-on`'s `.tagged_with()` is used with `any: true`,
the gem will use `SELECT *` regardless of any previous (or following) requests
of selecting a limited amount of columns.
Given that the `articles` table has [73 columns](https://dev.to/admin/blazer/queries/314-number-of-columns-in-all-tables )
that will amount to wasted RAM memory for columns we don't need.
By "unscoping" any previous `select()` we can optimize used memory.
Before:
```ruby
[24] pry(main)> Article.tagged_with([:ruby], any: true).select(:id, :name).to_sql
=> "SELECT \"articles\".*, \"articles\".\"id\", \"name\" FROM \"articles\" WHERE EXISTS (SELECT * FROM \"taggings\" WHERE \"taggings\".\"taggable_id\" = \"articles\".\"id\" AND \"taggings\".\"taggable_type\" = 'Article' AND \"taggings\".\"tag_id\" IN (SELECT \"tags\".\"id\" FROM \"tags\" WHERE (\"tags\".\"name\" LIKE 'ruby' ESCAPE '!')))"
```
Note, how the SQL query is `articles.*, articles.column_a`
After:
[25] pry(main)> Article.tagged_with([:ruby], any: true).unscope(:select).select(:id, :name).to_sql
=> "SELECT \"articles\".\"id\", \"name\" FROM \"articles\" WHERE EXISTS (SELECT * FROM \"taggings\" WHERE \"taggings\".\"taggable_id\" = \"articles\".\"id\" AND \"taggings\".\"taggable_type\" = 'Article' AND \"taggings\".\"tag_id\" IN (SELECT \"tags\".\"id\" FROM \"tags\" WHERE (\"tags\".\"name\" LIKE 'ruby' ESCAPE '!')))"
```
`articles.*` is gone :-)
- https://github.com/mbleigh/acts-as-taggable-on/issues/936
- 47da5036de/lib/acts_as_taggable_on/taggable/tagged_with_query/any_tags_query.rb (L2-L8)
2021-01-25 17:34:10 +01:00
Rafi
b13c76f405
Prevent text overflow of follow button ( #12422 )
2021-01-25 17:29:10 +01:00
rhymes
dd0ee3dd72
Optimize Admin::FeedbackMessagesController by adding proper indexes ( #12415 )
...
DEV has 30+ million email messages, to display some of them to the admin, they
all are scanned to find those that belong to the requested feedback messages.
This results in SQL queries that can take up to 15 seconds.
By adding an index, we cut the SQL response time to milliseconds.
2021-01-25 17:02:06 +01:00
Ben Halpern
8b5b19bfa8
Fix flash of unstyled content ( #12385 )
...
* Fix flash of unstyled content
* Fix test context
* Add missing user in test
* Add qualifier argument
2021-01-25 10:49:58 -05:00
Julianna Tetreault
2cd523f811
Update Tag Link to Route to Proper Admin Page ( #12391 ) [deploy]
...
* fix: update admin tag edit page link to include /edit
* Update admin tag edit page link to be more descriptive
2021-01-25 08:25:39 -07:00
dependabot[bot]
afc85f59b5
Bump @storybook/preact from 6.1.14 to 6.1.15 ( #12410 )
...
Bumps [@storybook/preact](https://github.com/storybookjs/storybook/tree/HEAD/app/preact ) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/app/preact )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 09:49:06 -05:00
dependabot[bot]
36e211c764
Bump @storybook/addon-knobs from 6.1.14 to 6.1.15 ( #12413 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/knobs )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 12:51:33 +01:00
dependabot[bot]
dbc8257b87
Bump oj from 3.11.0 to 3.11.1 ( #12405 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 10:33:25 +01:00
dependabot[bot]
67a778f079
Bump shoulda-matchers from 4.5.0 to 4.5.1 ( #12404 )
...
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers ) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases )
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v4.5.0...v4.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 10:32:58 +01:00
dependabot[bot]
e3c5f6d70f
Bump ransack from 2.4.1 to 2.4.2 ( #12407 )
...
Bumps [ransack](https://github.com/activerecord-hackery/ransack ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/activerecord-hackery/ransack/releases )
- [Changelog](https://github.com/activerecord-hackery/ransack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/activerecord-hackery/ransack/compare/2.4.1...v2.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-25 10:29:08 +01:00
narender2031
06a6191424
fix ui issue to display bug ( #12365 )
2021-01-22 15:47:19 -05:00
Mac Siri
fa451bff64
Remove mini_racer gem ( #12387 )
2021-01-22 15:36:10 -05:00
cyrillefr
a3e76b6d09
Refactor magic numbers for /comments rendering ( #12323 )
...
* Refactor magic numbers for `/comments` rendering (#11594 )
* Update comments_helper adding constants & accessor methods
* Refactor stories_controller replacing hard coded values by helper call
* Refactor _comments_section view accordingly with helper calls
* Add test to specs (view_user(index|comments)) accordingly
* Refactor magic numbers for `/comments` rendering
Small changes after initial review
* Change constante to more explicit names
* Change one helper method name
* Pluralize in view
Co-authored-by: rhymes <rhymes@hey.com>
2021-01-22 10:55:44 -06:00
Christina
1f90c63eac
Update issue.yml text. ( #12375 )
...
* Update issue.yml text.
Updating text to give more time for following up on issues and to let the community know why some feature requests may be closed.
* Update .github/workflows/issue.yml
Removing extremely
Co-authored-by: rhymes <rhymes@hey.com>
Co-authored-by: rhymes <rhymes@hey.com>
2021-01-22 10:02:24 -06:00
dependabot[bot]
7ce9940ad6
Bump test-prof from 0.12.2 to 1.0.0 ( #12382 )
...
Bumps [test-prof](https://github.com/test-prof/test-prof ) from 0.12.2 to 1.0.0.
- [Release notes](https://github.com/test-prof/test-prof/releases )
- [Changelog](https://github.com/test-prof/test-prof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/test-prof/test-prof/commits/v1.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-22 09:53:05 -06:00
Rafi
931d9169fd
Fixing link focus ( #12362 )
...
* Fixing link focus
1. Removing display content from link
2. Removing extra margin at the top of link
3. Adding before link
* Extending crayon-fields and removing margin-top
2021-01-22 09:26:51 -05:00
dependabot[bot]
fe9be955fd
Bump sidekiq from 6.1.2 to 6.1.3 ( #12380 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.1.2...v6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-22 08:01:34 -06:00
Fernando Valverde
88bd3a1069
Replace authentication_enabled_providers.include? with helper method ( #12379 )
...
* Replaces authentication_enabled_providers.include? with helper authentication_provider_enabled?
* Fix typo
2021-01-22 07:54:10 -06:00
Mac Siri
a63e7ef367
Expand slugignore & Add auto remove node_module rake task ( #12372 )
2021-01-22 07:24:26 -05:00
Mac Siri
5b48af2236
Move mini_racer and sassc-rails out of production ( #12378 )
2021-01-22 06:51:19 -05:00
dependabot[bot]
d9596d7d44
Bump webpack-bundle-analyzer from 4.3.0 to 4.4.0 ( #12381 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases )
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.3.0...v4.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-22 11:06:38 +00:00
Michael Kohl
6afaa25f50
Fix accidental publishing of draft articles ( #12288 )
...
* Fix accidental publishing of draft articles
* Add regression spec
* Fix spec
2021-01-22 08:47:16 +07:00
Julianna Tetreault
2ebe55fc22
Log Relevant Data from Self-Deletion Flow to Honeycomb ( #12369 ) [deploy]
...
* Log params[:token] and destroy_token to Honeycomb when token mismatch
* Refactor #confirm_destroy and add Honeycomb fields for error logging
* Add tests around Honeycomb error logging in #confirm_destroy to spec
* Remove logging of user to Honeycomb in #confirm_destroy and in spec
2021-01-21 17:00:10 -07:00
Julianna Tetreault
63a1484a56
fix: remove extra href from admin/articles/index.html.erb ( #12373 ) [deploy]
2021-01-21 16:32:18 -07:00
Andy Zhao
7c47d351f0
Cache only the static badge achievement data for notifications ( #12368 )
...
* Cache only the static badge achievement data for notifications
* Cache the image too, but at what cost...? 🤔
* Add data update script to clear badge achievement notifications' caches
* Remove unnecessary cache for badge achievement notifications
2021-01-21 17:03:42 -05:00
dependabot[bot]
c3cb2b0d1b
Bump sidekiq-unique-jobs from 6.0.25 to 7.0.0 ( #12361 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.25 to 7.0.0.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.25...v7.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 14:28:38 -06:00
Rafi
940c7ee37d
Adding aria labels and role to onboarding modal ( #12363 )
...
1. Adding role dialog
2. Adding aria-labelledby and aria-describedby
2021-01-21 13:58:55 -05:00
dependabot[bot]
876058ab6f
Bump preact from 10.5.10 to 10.5.11 ( #12357 )
...
Bumps [preact](https://github.com/preactjs/preact ) from 10.5.10 to 10.5.11.
- [Release notes](https://github.com/preactjs/preact/releases )
- [Commits](https://github.com/preactjs/preact/compare/10.5.10...10.5.11 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 09:33:22 -06:00
dependabot[bot]
62464806ca
Bump bullet from 6.1.2 to 6.1.3 ( #12360 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 08:33:51 -06:00
dependabot[bot]
ed8bcd3eec
Bump cypress-file-upload from 5.0.0 to 5.0.1 ( #12358 )
...
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases )
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 08:32:47 -06:00
dependabot[bot]
51066eb92f
Bump webdrivers from 4.4.2 to 4.5.0 ( #12359 )
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.4.2 to 4.5.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.4.2...v4.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 15:12:47 +01:00
Ridhwana
2dad0c42f8
Save Data Update Script errors to database and show them on http://localhost:3000/admin/data_update_scripts ( #12348 )
...
* feat: add an error column to the data update script
* feat: save the error to the error field
* feat: save the error when the script fails
* feat: show the script error on the data update script page
* chore: pass the error to mark_as_failed instead of having its own function
* refactor: use presence
* test: ensure that we test an error case of a data update script
* chore: rename errorneous to failing
* test: update some specs, working on the others
* chore: update tests now that there are two files
* chore: change error from a string to a text to allow for more char
2021-01-21 14:48:34 +01:00
Michael Kohl
71ea85be6e
Verify current password on password change ( #12174 )
...
* Verify current password on password change
* Address PR comments
* Allow password reset for logged in users
* Make password change message more explicit
* Reformat message
* Fix specs
2021-01-21 12:40:54 +07:00
Ben Halpern
e3d39e09b4
Patch: Fix UI bugs in follow adjustment form ( #12137 )
...
* Fix UI bugs in follow adjustment form
* Move to bottom
2021-01-20 17:23:18 -05:00
Michael Kohl
5d0fe12528
Update NavigationLink handling ( #12316 )
...
* Update copy
* Allow relative URLs and normalize on save
* Update specs
* Move clarification from index to form
* Add data update script
* Update spec
2021-01-20 13:57:59 -05:00
Arit Amana
94236d7ee6
Update dev.to/mods for non-logged in users ( #12301 )
...
* complete implementation
* check if forem is DEV properly
* Add tests
* improve tests
* improve tests again
* REALLY improve tests (sheesh!)
* Address code review comments
* small changes
* modify specs
2021-01-20 13:53:50 -05:00
Andy Zhao
0f15b8dbd3
Don't try to unsub users when destroying if Mailchimp is not enabled ( #12331 )
...
* Use proper Mailchimp newsletter IDs respective to methods
* Add guard clauses when Mailchimp newsletter isn't enabled
* Rubocop correction
* Only unsub after destroy if Mailchimp newsletter is enabled
* Refactor a bit
* Fix typo
* Fix boolean logic for guard clauses
* Update tests to account for new SiteConfig logic
* Break guard clause into two clauses
2021-01-20 12:32:35 -05:00