Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Fork #1

merged 310 commits into from Mar 3, 2020

Update Fork #1

merged 310 commits into from Mar 3, 2020


Copy link

cdrrazan commented Mar 3, 2020

What type of PR is this? (check all applicable)

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update


Related Tickets & Documents

Mobile & Desktop Screenshots/Recordings (if there are UI changes)

Added to documentation?

  • readme
  • no documentation needed

[optional] What gif best describes this PR or how it makes you feel?


citizen428 and others added 30 commits Feb 12, 2020
… [deploy]

* Consolidate `.decorate` calls

* Move Activerecord finders out of main stories feed partial

* Add back in decorates to sticky_articles partial

* Combine top and new articles returned from StoriesController

* Extract feed construction logic to a service

* Some PR tweaks (naming)

* Quick test fix
…sidekiq (thepracticaldev#5582) [deploy]
* TagsController inherits from ApiController
* Let ApiController inherit from ActionController::Base to have its own lifecycle
* Remove unused method
* Use only one respond_to :json for the entire API
* ApiController inherits from ActionController::Base
* Use Pundit only where needed
… to codeclimate (thepracticaldev#6047)
…y to remove ALL indexes (thepracticaldev#6042)
…themes (thepracticaldev#6004) [deploy]

* Remove error styling for a better UI in all themes

* Use text shadow to highlight syntax error
…icaldev#6034) [deploy]

It was unclear to me that I explicitly needed Elasticsearch in order for certain tests to run locally. We should specify that in the docs. Also added a note about installing `wget`, which is required to install Elasticsearch in our docs.
… [deploy]

* Add "Welcome" type to Broadcasts, allow dynamic "authoring" of Broadcasts

This adds a new `type_of` to the Broadcast model: "Welcome". As we begin to create a new "welcome notification" workflow, we'll categorize them by making them all of the same type.

This also adds a concept of a "welcoming user", which can be set via an ENV var. The WELCOMING_USER_ID will allow us to explicitly set (and change) which user in the database is the one that "sends" welcoming notification. In production, we plan for this to be

* Allow WelcomeNotificationWorker to accept + send any kind of broadcast

This abstracts out the logic of deciding which broadcast to send from the woker into the calling method. This will help us send many different kinds of welcome notifications using one, resuable worker class.

* Raise if a Notification can't be created

* Add STAFF_USER_ID as an ENV var

This is in preparation for moving away from SiteConfig.staff_user_id, and replacing it with an ENV var. We will need to set this in production first, and then make a separate PR to replace all instances of staff_user_id with the newly-set ENV var.
… [deploy]
… [deploy]
…aldev#6051) [deploy]
…by it later on. (thepracticaldev#6032) [deploy]

* feat: add approved as an index or ordered articles and for the algolia search

* oops: added approved to the wrong place, should be on ordered_articles
…) [deploy]

* Add additional safeguards for config write access

* Change spec name and confirmation step
…eck (thepracticaldev#6068) [deploy]
benhalpern and others added 28 commits Mar 1, 2020
* Small CSS fixes

* Minimal width notifier
* Started moving sponsorships to /internal

* Moving sponsorships to /internal

* Improved /internal/sponsorships

* Added destroying sponsorships to /internal

* Rename sponsorships creator in internal

* Add documentation for how to install ES from brew

* A bit clearer

* Update docs/installation/

Co-Authored-By: Ridhwana <>

* Update docs/installation/

Co-Authored-By: Ridhwana <>

* Move testing section after installation

* Update docs/installation/

Co-Authored-By: Vaidehi Joshi <>

* Update docs/installation/

Co-Authored-By: Vaidehi Joshi <>

Co-authored-by: Ridhwana <>
Co-authored-by: Vaidehi Joshi <>
) [deploy]

When an article is updated the associated collection is touched along with all its articles. This creates a deadlock where two transaction(nested) lock the article that was updated.
With this commit the collection wll be touched after the article updates transaction has been commited. Doing so we have two sequential transactions.
Bumps [stripe]( from 5.15.0 to 5.17.0.
- [Release notes](
- [Changelog](
- [Commits](stripe/stripe-ruby@v5.15.0...v5.17.0)

Signed-off-by: dependabot-preview[bot] <>
…v#6357) [deploy]

* chore: remove she coded route

* chore: remove the shecoded page

* chore: remove some assets

* chore: remove shecoded pages controller action
Bumps [elasticsearch]( from 7.4.0 to 7.5.0.
- [Release notes](
- [Changelog](
- [Commits](elastic/elasticsearch-ruby@v7.4.0...v7.5.0)

Signed-off-by: dependabot-preview[bot] <>
Bumps [better_errors]( from 2.5.1 to 2.6.0.
- [Release notes](
- [Commits](BetterErrors/better_errors@v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <>
Bumps [bootsnap]( from 1.4.5 to 1.4.6.
- [Release notes](
- [Changelog](
- [Commits](Shopify/bootsnap@v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <>
Bumps [nokogiri]( from 1.10.8 to 1.10.9.
- [Release notes](
- [Changelog](
- [Commits](sparklemotion/nokogiri@v1.10.8...v1.10.9)

Signed-off-by: dependabot-preview[bot] <>

* Fix allowed_user method of notifications controller

* Change to keep the current order of checks
* Add EmailAuthorization model

* Add model file oops

* Add comment for uuid type

Co-authored-by: Ben Halpern <>
… [deploy]

* Add published field to ClassifiedListing

* Add back query_conditions conditional

* Don't allow searches for unpublished listings

* Fix comment typo...oops!
@cdrrazan cdrrazan merged commit c01a252 into cdrrazan:master Mar 3, 2020
1 check failed
1 check failed
Travis CI - Pull Request Build Errored
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.