Commit graph

12441 commits

Author SHA1 Message Date
Mac Siri
45f25647ef
Fix flaky notifications_spec (#19215) 2023-03-10 06:59:30 -05:00
Ben Halpern
22e8d802da
Billboard style tweaks (#19206)
* Billboard style tweaks

* Padding-right adjustment

* Padding adjustments
2023-03-09 13:51:42 -05:00
depfu[bot]
3aabdf0fe9
Update all development Bundler dependencies (2023-03-06) (#19201)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-09 18:03:20 +02:00
depfu[bot]
82a43aba6d
[js] Update all Yarn dependencies (2023-02-20) (#19161)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-03-09 09:15:59 -05:00
Joshua Wehner
276a53b5b4
Permit params needs update to allow saving mastodon (see 0baafea) (#19210) 2023-03-08 09:00:08 -08:00
depfu[bot]
ec2ce4d27a
Update rack to version 2.2.6.3 (#19209)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-07 14:24:18 -08:00
Joshua Wehner
0baafeabb9
Fix social media settings to enable mastodon (#19191) 2023-03-07 16:49:16 +01:00
Lawrence
cfad413ca1
Display Rules for In house and Community Billboards (#19189)
* init

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add display ad query and update caller

* set as keyword args and add org id to callers

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/views/articles/_sticky_nav.html.erb

Co-authored-by: Joshua Wehner <joshua@forem.com>

* Update app/views/articles/show.html.erb

Co-authored-by: Joshua Wehner <joshua@forem.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Spacing

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/queries/display_ads/filtered_ads_query.rb

More spacing

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: Joshua Wehner <joshua@forem.com>

* Update app/queries/display_ads/filtered_ads_query.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix some broken specs

* add updated spec for billboard rules

* missing comma

* Update spec/queries/display_ads/filtered_ads_query_spec.rb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add placement in spec

* fix external spec

* cleanup

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Joshua Wehner <joshua@forem.com>
2023-03-06 14:15:14 -08:00
depfu[bot]
0fc6a455de
[ruby] Update ahoy_matey: 4.2.0 → 4.2.1 (patch) (#19194)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Lawrence <lawrence@forem.com>
2023-03-06 16:57:01 -05:00
depfu[bot]
521f8feb28
[ruby] Update pg: 1.4.4 → 1.4.6 (patch) (#19200)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-06 13:34:15 -05:00
Rajat Talesra
a64b8b2967
Multiple reactions fixes: Hover state added & heart+ icon changed (#19196)
* Hover style added

* Multiple reactions fixes
2023-03-04 11:31:26 +05:30
Lawrence
b5744b08c6
Billboards Ownership Style Rules (#19176)
* display ad partial

* add translations

* replace views with partial

* add context types

* check if ad is community

* not fully rounded

* fix spec

* updated styling

* adjust spacing
2023-03-03 13:19:09 -06:00
Joshua Wehner
727705dc89
Revert "Enable multiple reactions on #index (including front-end render)" (#19197) 2023-03-03 09:59:51 -05:00
Joshua Wehner
8a45a4bf67
Enable multiple reactions on #index (including front-end render) (#19169)
* Revert "(Temporarily) Remove multiple reactions from #index (#19142)"

This reverts commit a45d300639.

* Clean up reaction category count mechanism for #index

* Remove, unnecessary

* Expose reaction categories in JSON response

* Update test with new categories

* Fix flaky sample / minimum floor

* buildArticle (infinite scroll) with multiple reactions

* If we're doing #index front-end, we aren't feature-flag'd

* nbsp

* react (home feed) has multiple_reactions

* Update app/assets/javascripts/utilities/buildArticleHTML.js

Co-authored-by: Rajat Talesra <rajat@forem.com>

* Clean up Reactable#reaction_categories

* Use 'multiple_reactions_icons_container'

* Try adding a ReactionCount test

* Adapt memory fix from 76dd53d

* Try adding categories to fixture

* Attempt to eager-load distinct public categories

* Setting dependent to the default for rubocop

* Try making image assets more public?

* Revert "Fix flaky sample / minimum floor"

---------

Co-authored-by: Rajat Talesra <rajat@forem.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-03-03 15:17:19 +01:00
depfu[bot]
54a077a1ec
[ruby] Update pghero: 3.1.0 → 3.2.0 (minor) (#19192)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-02 13:31:09 -05:00
Mac Siri
670d82ac3b Fix homeFeed flaky spec 2023-03-02 12:50:45 -05:00
Mac Siri
627cb203f6
Address flaky specs (#19188) 2023-03-02 09:40:06 -05:00
Mac Siri
ca33ed8729
Touch reactable after taking admin action (#19185) 2023-03-02 09:35:11 -05:00
depfu[bot]
1c737e1b30
[ruby] Update oj: 3.14.1 → 3.14.2 (patch) (#19193)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-02 08:52:22 -05:00
depfu[bot]
68547bc212
[ruby] Update pg_query: 2.2.1 → 4.2.0 (major) (#19172)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Mac Siri <mac@forem.com>
Co-authored-by: Lawrence <lawrence@forem.com>
2023-03-01 16:29:26 -05:00
depfu[bot]
c7a8228f13
[ruby] Update strong_migrations: 1.4.2 → 1.4.3 (patch) (#19181)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-03-01 16:14:39 -05:00
Mac Siri
09291b4205
Update CI node count (#19174) 2023-02-27 12:54:05 -05:00
Rajat Talesra
1d60c5ff77
Added dropdown to display ads / billboards (#19106)
* Initial setup work with error

* Dropdown working with error fixed

* Removed repition

* Home page billboard dropdowns added

* Created common file for dropdown

* Complete display ad dropdown usage

* Minor indentation fix

* Minor UI updates

* Minor test update

* Dropdown for billboard optimisation

* Added anchor tags

* Display ad unified code

* Design changes

* Design changes

* Changes to display ad click tracking

* Style changes

* Design change to admin display ad

* Nit fix

* Nit fix

* Updated test
2023-02-27 22:57:01 +05:30
Mac Siri
140f85695b
Add forgot_password_throttle (#19175) 2023-02-27 09:25:29 -05:00
Joshua Wehner
db2b571bd6
Require an owner for 'community' billboards (#19167)
* Require an owner for 'community' billboards

* Reduce flakiness in this unrelated test
2023-02-27 14:22:47 +01:00
Adam Vollrath
4668e11dcc
Improvements to Uffizzi Preview Workflows (#19029) 2023-02-24 12:34:02 -05:00
depfu[bot]
5227272ef1
[ruby] Update fog-aws: 3.17.0 → 3.18.0 (minor) (#19170)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-02-24 10:55:16 -05:00
Rajat Talesra
fdfa6837fb
Quick fix for null class check (#19171) 2023-02-23 16:15:22 -05:00
yheuhtozr
195b81d4cb
Fix details liquid tag oversanitizing markdown (#19153)
Co-authored-by: Mac Siri <mac@forem.com>
2023-02-22 15:14:20 -05:00
Joshua Wehner
c251f4000d
Add creator to DisplayAd (#19126) 2023-02-22 14:17:22 -05:00
Mac Siri
ff3c3c9324
[CI] Collect RSpec artifacts (#19128)
Co-authored-by: Lawrence <lawrence@forem.com>
2023-02-22 12:52:52 -05:00
Rajat Talesra
7eae421a2a
Multiple Reactions: opens drawer on single tap - mobile device (#19155)
* Opens tap on single tap too

* Multiple Reactions single tap issue fixes

* Updated drawer heart+ icon behaviour
2023-02-22 16:15:17 +05:30
yheuhtozr
561ed1858f
Tweak i18n edited date format(#19104) 2023-02-21 18:30:57 -05:00
dancristianb
814080dc3b
Fix nested sidebar active item highlight (#18973)
Co-authored-by: Ridhwana <Ridhwana.Khan16@gmail.com>
Co-authored-by: Fernando Valverde <fernando@fdo.cr>
Co-authored-by: Joshua Wehner <joshua@forem.com>
2023-02-21 16:18:42 -05:00
Anna Buianova
efe540dfce
Billboards type_of: added field to the API and small admin form changes (#19125)
Co-authored-by: Joshua Wehner <joshua.wehner@gmail.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-02-21 14:17:40 -05:00
depfu[bot]
59330184ac
[ruby] Update redcarpet: 3.5.1 → 3.6.0 (minor) (#19067)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-02-21 11:29:46 -05:00
depfu[bot]
0126948fc6
[ruby] Update fog-aws: 3.16.0 → 3.17.0 (minor) (#19158)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-02-21 09:33:55 -05:00
Ben Halpern
76dd53d874
Fix icon memory issue (#19162) 2023-02-21 08:10:22 -05:00
Rajat Talesra
2a694df21a
Multiple Reactions icons stack fix (#19157)
* Multiple reactions stack reversed

* Nit fix

* Make icon center
2023-02-21 15:49:05 +05:30
Ben Halpern
df4568d275
Bust article on initial reactions to fix cached HTML issue (#19149)
* Bust article on initial reactions to fix cached HTML issue

* Fix whitespace issue

* Move cache-busting logic to worker

* Update app/workers/reactions/bust_reactable_cache_worker.rb

Co-authored-by: Joshua Wehner <joshua@forem.com>

---------

Co-authored-by: Joshua Wehner <joshua@forem.com>
2023-02-20 16:31:38 -05:00
Aramayis
c758272aec
Fix Uffizzi sign in bug(#19100) 2023-02-20 16:21:05 -05:00
depfu[bot]
a61130eb5e
[js] Update all Yarn dependencies (2023-02-16) (#19129)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-02-20 15:41:47 -05:00
depfu[bot]
4a2023f374
[ruby] Update rails: 7.0.4.1 → 7.0.4.2 (patch) (#19118)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Mac Siri <mac@forem.com>
2023-02-20 15:04:13 -05:00
Joshua Wehner
a45d300639
(Temporarily) Remove multiple reactions from #index (#19142) 2023-02-20 14:38:05 -05:00
Ben Halpern
9b66a8e406
Make multiple reactions play nicely with edge caching (Frontend) (#19147)
* Make multiple reactions play nicely with edge caching

* Remove backend code

* Update app/assets/javascripts/initializers/initializeArticleReactions.js
2023-02-20 12:55:50 -05:00
yheuhtozr
104a013551
[i18n] Remove redundant locale (#19066) 2023-02-20 12:03:30 -05:00
Mac Siri
b7b9e69721
Update Cypress's loginUser command (#19141) 2023-02-20 11:06:21 -05:00
Ben Halpern
e155212a19
Remove dead sitemap generator code (#19150) 2023-02-20 10:23:11 -05:00
depfu[bot]
191ef15615
[ruby] Upgrade rspec-rails: 5.1.2 → 6.0.1 (major) (#19130)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2023-02-20 09:22:34 -05:00
Joshua Wehner
048f0cff2a
[CI] Specifying node version explicitly (#19154) 2023-02-20 09:01:20 -05:00