diff --git a/Gemfile b/Gemfile index bf57e9a..f26a2af 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ end gem "actionpack-action_caching", "~> 1.2" gem "active_record_union", "~> 1.3" gem "acts-as-taggable-on", "~> 5.0" -gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master" +# gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master" +gem "acts_as_follower", github: 'tcocca/acts_as_follower', branch: "master" gem "addressable", "~> 2.5", ">= 2.5.2" gem "administrate", "~> 0.11" gem "ahoy_email", "~> 0.5" @@ -122,7 +123,8 @@ group :development, :test do gem "derailed", "~> 0.1" gem "erb_lint", "~> 0.0", require: false gem "faker", git: "https://github.com/stympy/faker.git", branch: "master" - gem "fix-db-schema-conflicts", github: "thepracticaldev/fix-db-schema-conflicts", branch: "master" + # gem "fix-db-schema-conflicts", github: "thepracticaldev/fix-db-schema-conflicts", branch: "master" + gem "fix-db-schema-conflicts", github: "jakeonrails/fix-db-schema-conflicts", branch: "master" gem "memory_profiler", "~> 0.9" gem "parallel_tests", "~> 2.27" gem "pry-byebug", "~> 3.7" diff --git a/Gemfile.lock b/Gemfile.lock index 331bf9c..cee4a76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jakeonrails/fix-db-schema-conflicts.git + revision: ae9135e0bb1fb142dd483f883da0064b8be17732 + branch: master + specs: + fix-db-schema-conflicts (3.1.1) + rubocop (>= 0.38.0) + GIT remote: https://github.com/stympy/faker.git revision: 9910aa58d92c018abab25d491191576fcc1a7707 @@ -7,21 +15,13 @@ GIT i18n (>= 0.7) GIT - remote: https://github.com/thepracticaldev/acts_as_follower.git - revision: 288690cd99bc470eaee493fce5bfa9fe23157692 + remote: https://github.com/tcocca/acts_as_follower.git + revision: c5ac7b9601c4af01eb4d9112330b27be4d694ecc branch: master specs: acts_as_follower (0.2.1) activerecord (>= 4.0) -GIT - remote: https://github.com/thepracticaldev/fix-db-schema-conflicts.git - revision: 4172392392e1a8d907f7ab673cb5ddd9a4a31940 - branch: master - specs: - fix-db-schema-conflicts (3.0.2) - rubocop (>= 0.38.0) - GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index df60029..9373ec2 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -3,6 +3,15 @@ class StoriesController < ApplicationController before_action :set_cache_control_headers, only: %i[index search show] def index + push_headers = [ + "<#{view_context.asset_path('bell.svg')}>; rel=preload; as=image", + "<#{view_context.asset_path('menu.svg')}>; rel=preload; as=image", + "<#{view_context.asset_path('connect.svg')}>; rel=preload; as=image", + "<#{view_context.asset_path('stack.svg')}>; rel=preload; as=image", + "<#{view_context.asset_path('lightning.svg')}>; rel=preload; as=image", + ] + response.headers["Link"] = push_headers.join(", ") + add_param_context(:username, :tag) return handle_user_or_organization_or_podcast_index if params[:username] return handle_tag_index if params[:tag] diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb index 1137465..02d8336 100644 --- a/app/views/articles/index.html.erb +++ b/app/views/articles/index.html.erb @@ -33,7 +33,7 @@