From f55791f10d038740d7ee9e28e46573c341609c98 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 17 Aug 2017 18:23:40 +0200 Subject: [PATCH 1/3] fix intermittent 500s --- app/views/content/cards/_in_universe_content_list.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/content/cards/_in_universe_content_list.html.erb b/app/views/content/cards/_in_universe_content_list.html.erb index 5bb5efa5..b796ca46 100644 --- a/app/views/content/cards/_in_universe_content_list.html.erb +++ b/app/views/content/cards/_in_universe_content_list.html.erb @@ -31,7 +31,7 @@ <% end %> <% if defined?(@content) && @content.is_a?(Universe) && content_type != :universe %> - <%= link_to content_type.to_s.pluralize.titleize, send("#{content_type.to_s.pluralize}_universe_path"), class: "#{content_type_class.color}-text" %> + <%= link_to content_type.to_s.pluralize.titleize, send("#{content_type.to_s.pluralize}_universe_path", { id: @content.id }), class: "#{content_type_class.color}-text" %> <% else %> <%= content_type.to_s.pluralize.titleize %> <% end %> @@ -60,7 +60,7 @@
<% if defined?(@content) && @content.is_a?(Universe) && content_type != :universe %> - <%= link_to "Browse #{content_type.to_s.pluralize}", send("#{content_type.to_s.pluralize}_universe_path"), class: "btn #{content_type_class.color} lighten-1" %> + <%= link_to "Browse #{content_type.to_s.pluralize}", send("#{content_type.to_s.pluralize}_universe_path", { id: @content.id }), class: "btn #{content_type_class.color} lighten-1" %> <% else %>
<% button_text = content_list.any? ? "Create another #{content_type}" : "Create one" %> From d57944d5ac6e56286ca96e8e39a1dc16a7e70d88 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 29 Sep 2017 14:56:30 -0500 Subject: [PATCH 2/3] Add Heroku generated app.json --- app.json | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 app.json diff --git a/app.json b/app.json new file mode 100644 index 00000000..33fd1bd2 --- /dev/null +++ b/app.json @@ -0,0 +1,109 @@ +{ + "name": "notebook", + "scripts": { + }, + "env": { + "AWS_ACCESS_KEY_ID": { + "required": true + }, + "AWS_REGION": { + "required": true + }, + "AWS_SECRET_ACCESS_KEY": { + "required": true + }, + "GOOGLE_TRANSLATE_API_KEY": { + "required": true + }, + "HEROKU_POSTGRESQL_BROWN_URL": { + "required": true + }, + "HEROKU_POSTGRESQL_PUCE_URL": { + "required": true + }, + "LANG": { + "required": true + }, + "LIBRATO_PASSWORD": { + "required": true + }, + "LIBRATO_TOKEN": { + "required": true + }, + "LIBRATO_USER": { + "required": true + }, + "LOG_LEVEL": { + "required": true + }, + "MAINTENANCE_PAGE_URL": { + "required": true + }, + "MIXPANEL_TOKEN": { + "required": true + }, + "RACK_ENV": { + "required": true + }, + "RAILS_ENV": { + "required": true + }, + "RAILS_SERVE_STATIC_FILES": { + "required": true + }, + "RAYGUN_API_KEY": { + "required": true + }, + "RUBY_GC_HEAP_GROWTH_FACTOR": { + "required": true + }, + "S3_BUCKET_NAME": { + "required": true + }, + "SCOUT_KEY": { + "required": true + }, + "SCOUT_MONITOR": { + "required": true + }, + "SECRET_KEY_BASE": { + "required": true + }, + "SECRET_TOKEN": { + "required": true + }, + "SENDGRID_DOMAIN": { + "required": true + }, + "SENDGRID_PASSWORD": { + "required": true + }, + "SENDGRID_USERNAME": { + "required": true + }, + "SLACK_HOOK": { + "required": true + }, + "STRIPE_API_KEY": { + "required": true + }, + "STRIPE_PUBLISHABLE_KEY": { + "required": true + } + }, + "formation": { + }, + "addons": [ + "librato", + "heroku-postgresql", + "heroku-postgresql", + "raygun", + "scout", + "sendgrid" + ], + "buildpacks": [ + { + "url": "heroku/ruby" + } + ] +} From 16828ed1fc5fb2786028a9fb6c79e7d7b5e00bba Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 29 Sep 2017 21:59:36 +0200 Subject: [PATCH 3/3] Update app.json that heroku added to repo without confirmation? --- app.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app.json b/app.json index 33fd1bd2..1e211c59 100644 --- a/app.json +++ b/app.json @@ -18,9 +18,6 @@ "HEROKU_POSTGRESQL_BROWN_URL": { "required": true }, - "HEROKU_POSTGRESQL_PUCE_URL": { - "required": true - }, "LANG": { "required": true }, @@ -96,7 +93,6 @@ "addons": [ "librato", "heroku-postgresql", - "heroku-postgresql", "raygun", "scout", "sendgrid"