about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-11-24 12:27:15 -0600
committerFire Demon <firedemon@creature.cafe>2020-11-24 12:27:15 -0600
commit69fa4f7d4f3c435018c1e7cb9e6a0fcb5b233695 (patch)
treeffbd8bc1e5c820fce33624874088863c43460299 /config
parent90b33ab8af91991217cdce3e2d9163756e58a691 (diff)
parent24696458bf22c8529b49f89b2791e3e07583b7e0 (diff)
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'config')
-rw-r--r--config/initializers/cache_buster.rb10
-rw-r--r--config/initializers/paperclip.rb1
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/routes.rb1
4 files changed, 13 insertions, 1 deletions
diff --git a/config/initializers/cache_buster.rb b/config/initializers/cache_buster.rb
new file mode 100644
index 000000000..227e450f3
--- /dev/null
+++ b/config/initializers/cache_buster.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+  config.x.cache_buster_enabled = ENV['CACHE_BUSTER_ENABLED'] == 'true'
+
+  config.x.cache_buster = {
+    secret_header: ENV['CACHE_BUSTER_SECRET_HEADER'],
+    secret: ENV['CACHE_BUSTER_SECRET'],
+  }
+end
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index b841d5220..25adcd8d6 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -107,7 +107,6 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
 else
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
-    use_timestamp: true,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
     url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
   )
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14a859bbe..ee855cc98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -844,6 +844,7 @@ en:
       request: Request your archive
       size: Size
     blocks: You block
+    bookmarks: Bookmarks
     csv: CSV
     domain_blocks: Domain blocks
     lists: Lists
@@ -920,6 +921,7 @@ en:
     success: Your data was successfully uploaded and will now be processed in due time
     types:
       blocking: Blocking list
+      bookmarks: Bookmarks
       domain_blocking: Domain blocking list
       following: Following list
       muting: Muting list
diff --git a/config/routes.rb b/config/routes.rb
index c9962dd7d..3a591adef 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -134,6 +134,7 @@ Rails.application.routes.draw do
       resources :mutes, only: :index, controller: :muted_accounts
       resources :lists, only: :index, controller: :lists
       resources :domain_blocks, only: :index, controller: :blocked_domains
+      resources :bookmarks, only: :index, controller: :bookmarks
     end
 
     resources :two_factor_authentication_methods, only: [:index] do