- Important notice: Notebook.ai will be going down temporarily for emergency maintenance to upgrade the database at 22:00 UTC. - This maintenance should last no longer than 1 hour. -
-diff --git a/Gemfile b/Gemfile index a73152b2..9351d6c9 100644 --- a/Gemfile +++ b/Gemfile @@ -47,6 +47,7 @@ gem 'slack-notifier' group :production do gem 'rails_12factor' gem 'uglifier', '>= 1.3.0' + gem 'scout_apm' end group :test, :production do diff --git a/Gemfile.lock b/Gemfile.lock index e50aa9fa..84085bf6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,6 +290,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + scout_apm (2.1.12) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -377,6 +378,7 @@ DEPENDENCIES rubocop ruby-prof (= 0.15.9) sass-rails + scout_apm selenium-webdriver serendipitous! shoulda-matchers (~> 3.1) diff --git a/app/controllers/characters_controller.rb b/app/controllers/characters_controller.rb index fd498e98..d4a650a0 100644 --- a/app/controllers/characters_controller.rb +++ b/app/controllers/characters_controller.rb @@ -11,7 +11,7 @@ class CharactersController < ContentController def content_param_list [ :universe_id, :user_id, - :name, :age, :role, :gender, :age, :height, :weight, :haircolor, + :name, :age, :role, :gender, :age, :archetype, :height, :weight, :haircolor, :facialhair, :eyecolor, :race, :skintone, :bodytype, :identmarks, :religion, :politics, :prejudices, :occupation, :pets, :mannerisms, :birthday, :education, :background, diff --git a/app/models/character.rb b/app/models/character.rb index 7d5a28dc..9c8d92a6 100644 --- a/app/models/character.rb +++ b/app/models/character.rb @@ -51,7 +51,7 @@ class Character < ActiveRecord::Base { overview: { icon: 'info', - attributes: %w(name role gender age universe_id) + attributes: %w(name role gender age archetype universe_id) }, looks: { icon: 'face', diff --git a/app/views/content/_form.html.erb b/app/views/content/_form.html.erb index 4839d943..48dc2094 100644 --- a/app/views/content/_form.html.erb +++ b/app/views/content/_form.html.erb @@ -67,6 +67,12 @@ <% through_class = content.class.reflect_on_association(attribute).options[:through].to_s %> <%= render 'content/form/relation_input', f: f, attribute: attribute, relation: through_class %> + <% elsif attribute == 'archetype' %> +
- Important notice: Notebook.ai will be going down temporarily for emergency maintenance to upgrade the database at 22:00 UTC. - This maintenance should last no longer than 1 hour. -
-