Commit graph

7731 commits

Author SHA1 Message Date
rhymes
e79f5fd15b
Tell Dependabot to ignore Simplecov 0.18+ (#11930) 2020-12-16 17:48:41 +01:00
dependabot[bot]
bda12c4e17
Bump redcarpet from 3.5.0 to 3.5.1 (#11925)
Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-16 07:54:50 -05:00
dependabot[bot]
b3b2f14ee7
Bump oj from 3.10.16 to 3.10.17 (#11926)
Bumps [oj](https://github.com/ohler55/oj) from 3.10.16 to 3.10.17.
- [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.10.16...v3.10.17)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-16 07:54:32 -05:00
dependabot[bot]
1037671e6b
Bump rouge from 3.25.0 to 3.26.0 (#11927)
Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.25.0 to 3.26.0.
- [Release notes](https://github.com/rouge-ruby/rouge/releases)
- [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rouge-ruby/rouge/compare/v3.25.0...v3.26.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-16 07:54:20 -05:00
dependabot[bot]
28fe3184ed
Bump blazer from 2.3.1 to 2.4.0 (#11928)
Bumps [blazer](https://github.com/ankane/blazer) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/ankane/blazer/releases)
- [Changelog](https://github.com/ankane/blazer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/blazer/compare/v2.3.1...v2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-16 07:54:07 -05:00
Anna Buianova
1ae0b4f47a
Use helpers.tag and safe_join instead of html_safe (#11916) 2020-12-16 10:02:19 +03:00
Nick Taylor
f6278a9106
Add Cypress to Travis (#11867)
* Added test run artifacts to git ignore.

* Added Cypress run to Travis.

* Added the start-server-and-test package.

* Added e2e ci scripts.

* Split up commands.

* Testing e2e after rspecs on same build node.

* Move Cypress back to node 0 for Knapsack.

* Added folders for build artifacts for failed E2E tests.

* Simplified e2e for CI

* Using knapsack-pro-cypress now.

* Added data-testid to sign up form for tests.

* Added forem secret for CI

* Updated initial admin fixture.

* Reworked test to be a signup test. wip.

* Added cypress file upload package.

* added fixture for admin profile image.

* Updated forem secret for tests.

* Added Cypress file upload to Cypress commands.

* Changed test to initial sign up for the first admin user.

* Fixed test to ensure there are no signup errors.

* Added some logging to see what's up.

* Added some comments to the test.

* Set Chrome web security to false to prevent CORS errors.

Co-authored-by: rhymes <rhymes@hey.com>
2020-12-15 21:26:34 -05:00
Michael Kohl
4b9779dc82
Make social preview color a color field (#11903) 2020-12-16 08:37:00 +07:00
Ben Halpern
ad1a59a14c
Fix html variant image prefix logic (#11917)
* Fix html variant image prefix logic

* Update app/models/html_variant.rb

Co-authored-by: Mac Siri <mac@dev.to>

* Update spec/models/html_variant_spec.rb

Co-authored-by: Julianna Tetreault <32834804+juliannatetreault@users.noreply.github.com>

* Use helper to simplify url code and update spec

* Provide Imgproxy default endpoint

Co-authored-by: Mac Siri <mac@dev.to>
Co-authored-by: Julianna Tetreault <32834804+juliannatetreault@users.noreply.github.com>
Co-authored-by: Mac Siri <krairit.siri@gmail.com>
2020-12-15 14:44:11 -05:00
Sarthak Sharma
bb532d39b3
Canvas in draw in now responsie 🚀 (#11876) 2020-12-15 13:08:09 -05:00
dependabot[bot]
1b4bd6f82e
Bump rails-settings-cached from 2.4.0 to 2.5.1 (#11910)
Bumps [rails-settings-cached](https://github.com/huacnlee/rails-settings-cached) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/huacnlee/rails-settings-cached/releases)
- [Changelog](https://github.com/huacnlee/rails-settings-cached/blob/master/CHANGELOG.md)
- [Commits](https://github.com/huacnlee/rails-settings-cached/compare/v2.4.0...v2.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 18:49:13 +01:00
dependabot[bot]
3f3f8aaf09
Bump husky from 4.3.0 to 4.3.6 (#11906)
Bumps [husky](https://github.com/typicode/husky) from 4.3.0 to 4.3.6.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v4.3.0...v4.3.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 15:10:50 +01:00
dependabot[bot]
1f617d27f3
Bump @babel/core from 7.12.9 to 7.12.10 (#11907)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.9 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 09:03:12 -05:00
dependabot[bot]
751b23690d
Bump bullet from 6.1.0 to 6.1.2 (#11905)
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.0 to 6.1.2.
- [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.0...6.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 13:10:36 +01:00
dependabot[bot]
54b94fb67c
Bump puma from 5.1.0 to 5.1.1 (#11911)
Bumps [puma](https://github.com/puma/puma) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 13:07:54 +01:00
dependabot[bot]
de76220eda
Bump @storybook/addon-actions from 6.1.8 to 6.1.11 (#11908)
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.1.8 to 6.1.11.
- [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.11/addons/actions)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 13:07:34 +01:00
dependabot[bot]
eb47fdc6d8
Bump inline_svg from 1.7.1 to 1.7.2 (#11904)
Bumps [inline_svg](https://github.com/jamesmartin/inline_svg) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/jamesmartin/inline_svg/releases)
- [Changelog](https://github.com/jamesmartin/inline_svg/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jamesmartin/inline_svg/compare/v1.7.1...v1.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 13:07:15 +01:00
dependabot[bot]
d97241e815
Bump flipper-active_record from 0.19.0 to 0.19.1 (#11889)
Bumps [flipper-active_record](https://github.com/jnunemaker/flipper) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/jnunemaker/flipper/releases)
- [Changelog](https://github.com/jnunemaker/flipper/blob/master/Changelog.md)
- [Commits](https://github.com/jnunemaker/flipper/compare/v0.19.0...v0.19.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 12:57:40 +01:00
dependabot[bot]
0eec93d480
Bump @stoplight/spectral from 5.7.1 to 5.7.2 (#11891)
Bumps [@stoplight/spectral](https://github.com/stoplightio/spectral) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/stoplightio/spectral/releases)
- [Changelog](https://github.com/stoplightio/spectral/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/stoplightio/spectral/compare/v5.7.1...v5.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15 12:53:54 +01:00
rhymes
8a9bb8e9ff
Switch node-sass to dart-sass (#11873)
* Quiet StoryBook on Travis

* Fix StoryBook glob

* Switch node-sass to dart-sass

* Fix Netlify build error

* Tell Netlify to install Yarn

* Netlify defaults to npm, let's stick to it
2020-12-14 22:06:06 -05:00
Michael Kohl
09fc23fd56
Move back from after_initialize to explicit call (#11881) 2020-12-14 17:16:27 -05:00
dependabot[bot]
1e0c53811d
Bump flipper-ui from 0.19.0 to 0.19.1 (#11888)
Bumps [flipper-ui](https://github.com/jnunemaker/flipper) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/jnunemaker/flipper/releases)
- [Changelog](https://github.com/jnunemaker/flipper/blob/master/Changelog.md)
- [Commits](https://github.com/jnunemaker/flipper/compare/v0.19.0...v0.19.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 17:02:30 -05:00
dependabot[bot]
21f6217ce4
Bump twilio-ruby from 5.44.0 to 5.45.0 (#11886)
Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.44.0 to 5.45.0.
- [Release notes](https://github.com/twilio/twilio-ruby/releases)
- [Changelog](https://github.com/twilio/twilio-ruby/blob/main/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-ruby/compare/5.44.0...5.45.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 17:02:22 -05:00
dependabot[bot]
77176ed370
Bump email_validator from 2.0.1 to 2.2.2 (#11885)
Bumps [email_validator](https://github.com/K-and-R/email_validator) from 2.0.1 to 2.2.2.
- [Release notes](https://github.com/K-and-R/email_validator/releases)
- [Changelog](https://github.com/K-and-R/email_validator/blob/master/CHANGELOG.md)
- [Commits](https://github.com/K-and-R/email_validator/compare/v2.0.1...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 17:02:10 -05:00
dependabot[bot]
8cda3d3c5a
Bump eslint-config-prettier from 6.15.0 to 7.0.0 (#11892)
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.15.0 to 7.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.15.0...v7.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 14:31:10 -05:00
dependabot[bot]
61878861ce
Bump @storybook/addon-docs from 6.1.9 to 6.1.11 (#11890)
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.1.9 to 6.1.11.
- [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.11/addons/docs)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 14:30:41 -05:00
dependabot[bot]
f84b885fd0
Bump @babel/plugin-transform-react-jsx from 7.12.7 to 7.12.10 (#11893)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 14:29:57 -05:00
dependabot[bot]
4b222ac539
Bump @storybook/addons from 6.1.10 to 6.1.11 (#11894)
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons) from 6.1.10 to 6.1.11.
- [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.11/lib/addons)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-14 13:35:44 -05:00
rhymes
d8bc399a56
Restore static error pages (#11882)
* Revert "Use static error files in serviceworker (#11806)"

This reverts commit 2c96c14021.

* Revert "Use custom, dynamic, error pages (#11744)"

This reverts commit 2ab0719501.

* Remove GitHub report prompt for good, see #11718

* Bump service worker cache version
2020-12-14 12:06:41 -05:00
rhymes
d24a40944c
Update Dependabot configuration for Bundler, Yarn/NPM and actions (#11877) 2020-12-14 17:31:16 +01:00
Joe Doss
9ccd06bfa5
Fix a few bugs with the create_buildkite_pr_build.sh script (#11872)
* Fix a few bugs with the create_buildkite_pr_build.sh script.

This will ${PULL_REQUEST_ID:-} will allow for PULL_REQUEST_ID to be not set in
the if statement so the script won't fail.

It fixes the jq lookups on GITHUB_EVENT_PATH for setting:

PULL_REQUEST_ID
COMMENT_USER_LOGIN
COMMENT_URL

from GITHUB_EVENT_PATH

It fixes the jq lookups on

* Add in missing dub quotes
2020-12-14 08:35:29 -06:00
rhymes
174950a827
Remove duplicate test file (#11883)
* Remove duplicate membership test

* Restore single Membership.test.jsx
2020-12-14 14:59:26 +01:00
Anna Buianova
5430448305
Confirmations that users GDPR data was deleted (#11039)
* Display gdpr delete requests for deleted users in admin

* Added a test for destroy a gdpr request

* Reorganized gdpr requests menu

* Update schema version

* Added a link to the flash notice after user delete by admin

* Fix namespace for tests

* Aligh schema.rb with master

* Added a missing newline

* Removed unused partial

* Fix typo

Co-authored-by: Michael Kohl <me@citizen428.net>

* Replaced string with symbols for AR

Co-authored-by: Michael Kohl <me@citizen428.net>

* Added an AuditLog record on gdpr delete confirmation

* Make email and user_id required in Users::GdprDeleteRequest

* Checked out package.json from master

* Fix Gdpr => GDPR

* Added missing space

* Remove unneeded freeze

Co-authored-by: Michael Kohl <me@citizen428.net>
2020-12-14 12:49:45 +03:00
Ben Halpern
e5cbfe61f4
Add campaign articles to sidebar controller (#11879)
* Add campaign articles to sidebar controller

* Fix sidebar additional erb logic
2020-12-13 19:44:17 -05:00
Ben Halpern
3308bf5e3d
Add sidebar bust logic (#11878)
* Add sidebar bust logic

* Fix typo
2020-12-13 19:43:44 -05:00
benhalpern
ae7c9a4f75 Fetch homepage right sidebar async (and don't fetch for narrow screens) 2020-12-13 18:41:47 -05:00
Joe Doss
24eb8b3354
Rework the PULL_REQUEST_ID logic, again (#11871)
and move github.event.issue.number to the workflow file....
2020-12-11 16:03:53 -06:00
Joe Doss
f88608ccf6
Rework the PULL_REQUEST_ID logic (#11869) 2020-12-11 15:31:52 -06:00
Nick Taylor
b922b0f319
E2E Test: Initial Adminisitrator Login Flow (#11840)
* Set baseUrl for Cypress tests.

* Fixed login form for tests.

* Added fixture data for initial admin credentials.

* First e2e test.

* Fixed a typo in a comment.

* Using an input of type submit like the login previously had was fine.

* Added a check to ensure user is redirected to the home page.

* Forgot to commit adding @testing-library/cypress

* Renamed and move login flow under loginFlows in integrations.

* Added testing library to support files so it does not need to be imported into every test explicitly by the test writer.

* Added some more Cypress related files that will be required for testing going forward.

* Took onboarding into account when checking the URL post login.
2020-12-11 13:44:18 -05:00
Joe Doss
20598be83f
Add GITHUB_TOKEN to workflow. (#11866) 2020-12-11 12:17:05 -06:00
rhymes
c0ac718642
Disable Google reCAPTCHA in env file sample (#11863)
* Disable Google reCAPTCHA in env file sample

* Update .env_sample

Co-authored-by: Jacob Herrington <jacobherringtondeveloper@gmail.com>

Co-authored-by: Jacob Herrington <jacobherringtondeveloper@gmail.com>
2020-12-11 18:17:48 +01:00
Joe Doss
c87951d4f2
Add create_buildkite_pr_build.sh (#11849)
* Remove rebase workflow as it will not work as expected with third party forks.

* Add the create_buildkite_pr_build.sh script.

This script will use the GitHub API to gather information about the PR, the PR
Author and create a Pull Request pipeline build on Buildkite.

You can mock out the things needed to work on this script locally with the
following environment variables exported:

export BUILDKITE_API_ACCESS_TOKEN=notarealtoken
export GITHUB_EVENT_PATH=$(curl --silent 2d0e0bdefc/github_actions_event_context.json)
export GITHUB_REPOSITORY=forem/forem
export GITHUB_TOKEN=notarealtoken

Note: You will need to get your own BUILDKITE_API_ACCESS_TOKEN and GITHUB_TOKEN
tokens.

You can then run the script locally to create builds from a pull request. The
GITHUB_EVENT_PATH JSON data is from https://github.com/forem/forem/pull/1181
which might not build on Buildkite down the road if is is closed. You might need
to pull down that JSON data and find and replace the PR number 11818 with thing
else.

Also this script could be busted out into it's own GitHub Action repo so you can
work on it outside of the Forem repo, but I don't have the mental fortitude to
work on GitHub Actions at this time. It is the most painful CI systems I have used
to date in terms of having an very very poor feedback loop/developer experience.
It desperately needs a REPL or mock shell for you to develop actions in so you don't
have to keep submitting PRs to your main branch to see results.
2020-12-11 09:41:02 -06:00
Anna Buianova
f4c88341ce
Rubocop fixes (#11862) 2020-12-11 17:36:42 +03:00
rhymes
f8a8e0320b
Fix Dependabot GitHub action syntax (#11864) 2020-12-11 15:10:20 +01:00
Alex
494359fd21
Create services for busting organizations, podcast episodes, listings, and users (#11832)
* Create service for bust_organization

* Create bust_podcast_episode_service

* Add error spec to BustOrganization

* Create bust_listings

* Create bust_user service
2020-12-11 08:59:24 -05:00
Ben Halpern
c5960f4640
Make mod button only show up for trusted user (#11856) 2020-12-11 07:51:04 -05:00
Molly Struve
5f5bdb4a32
Refactor:Remove old teams from CODEOWNERS and update general teams (#11850) 2020-12-11 06:49:01 -06:00
dependabot[bot]
bcadebb3ef
Bump ini from 1.3.5 to 1.3.7 (#11858)
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-10 22:37:43 -05:00
Ridhwana
23235c2276
feat: update the contact email address in the database (#11848) 2020-12-10 12:35:46 -06:00
Jacob Herrington
563a2c5a22
Fix misleading comment (#11847)
I'm updating this comment based on @citizen428's feedback.

https://github.com/forem/forem/pull/11836#discussion_r539811288
2020-12-10 12:34:23 -06:00