Commit 1ef59c22 authored by mgabdev's avatar mgabdev

Updates to fixes for deploy

• Updates:
- to fixes for deploy
parent 351929b1
......@@ -43,7 +43,7 @@ class Api::V1::PopularLinksController < Api::BaseController
cards = PreviewCard.joins("LEFT JOIN preview_cards_statuses ON preview_cards.id = preview_cards_statuses.preview_card_id")
.where('preview_cards_statuses.preview_card_id IS NOT NULL')
.where('preview_cards_statuses.status_id IN (?)', statusIds)
.having('COUNT(preview_cards_statuses.preview_card_id) > 2')
.having('COUNT(preview_cards_statuses.preview_card_id) > 1')
.where('preview_cards.updated_at > ?', 24.hours.ago)
.order('COUNT(preview_cards_statuses.preview_card_id) DESC')
.group('preview_cards.id')
......
......@@ -64,7 +64,7 @@ export const expandGabTrendsFeed = (feedId) => (dispatch, getState) => {
dispatch(expandGabTrendsFeedRequest(feedId))
const url = `http://trends.gab.com/feed/${feedId}?fmt=json&p=${page}`
const url = `https://trends.gab.com/feed/${feedId}?fmt=json&p=${page}`
// api(getState).get(`/api/v1/gab_trends?type=rss&page=${page}&feedId=${feedId}`).then((response) => {
axios.get(url).then((response) => {
dispatch(expandGabTrendsFeedSuccess(response.data.rssFeedItems, feedId, response.data.pagination.p))
......
......@@ -20,10 +20,10 @@ Rails.application.config.content_security_policy do |p|
if Rails.env.development?
webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls, "https://*.gab.com", "https://api.tenor.com"
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls, "https://*.gab.com"
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host, "https://*.gab.com"
else
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, "https://*.gab.com", "https://api.tenor.com"
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, "https://*.gab.com"
p.script_src :self, assets_host, "https://*.gab.com"
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment