Merge pull request #543 from ZmagoD/zd_SCI_1141_1183

fixes info dropdown links, adds new relic gem

Gemfile

@@ -67,6 +67,7 @@ gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
 gem 'tinymce-rails' # Rich text editor
 
 gem 'base62' # Used for smart annotations
+gem 'newrelic_rpm'
 
 group :development, :test do
   gem 'byebug'

Gemfile.lock

@@ -188,6 +188,7 @@ GEM
       coffee-rails (>= 3.2.1)
       jquery-rails
       rails (>= 3.2.0)
+    newrelic_rpm (4.0.0.332)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -369,6 +370,7 @@ DEPENDENCIES
   minitest-reporters (~> 1.1)
   momentjs-rails (>= 2.9.0)
   nested_form_fields
+  newrelic_rpm
   nokogiri
   paperclip (~> 4.3)
   pg

app/views/shared/_navigation.html.erb

@@ -197,18 +197,15 @@
             <span class="glyphicon glyphicon-info-sign"></span>
           </a>
           <ul class="dropdown-menu" data-hook="navigation-help-menu">
+            <li><%= link_to t('nav.help.support'),
+                              Constants::SUPPORT_URL,
+                              target: "_blank" %></li>
             <li><%= link_to t('nav.help.tutorials'),
                               Constants::TUTORIALS_URL,
                               target: "_blank" %></li>
-            <li><%= link_to t('nav.help.faq'),
-                              Constants::FAQ_URL,
-                              target: "_blank" %></li>
             <li><%= link_to t('nav.help.release_notes'),
                               Constants::RELEASE_NOTES_URL,
                               target: "_blank" %></li>
-            <li><%= link_to t('nav.help.support'),
-                              Constants::SUPPORT_URL,
-                              target: "_blank" %></li>
             <li><%= link_to t('nav.help.premium'),
                               Constants::PREMIUM_URL,
                               target: "_blank" %></li>

config/initializers/constants.rb

@@ -177,7 +177,6 @@ class Constants
 
   HTTP = 'http://'.freeze
   TUTORIALS_URL = (HTTP + 'scinote.net/product/tutorials/').freeze
-  FAQ_URL = (HTTP + 'scinote.net/product/faq/').freeze
   SUPPORT_URL = (HTTP + 'scinote.net/support').freeze
   PREMIUM_URL = (HTTP + 'scinote.net/premium/').freeze
   CONTACT_URL = (HTTP + 'scinote.net/story-of-scinote/#contact-scinote').freeze

config/locales/en.yml

@@ -68,9 +68,8 @@ en:
       logout: "Log out"
     help:
       tutorials: "Tutorials"
-      faq: "FAQ"
       release_notes: "Release notes"
-      support: "Support"
+      support: "Customer support"
       premium: "Premium"
       contact: "Contact us"
     activities:

config/newrelic.yml

@@ -0,0 +1,47 @@
+#
+# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+# .NET, PHP, Python and Node applications with deep visibility and low
+# overhead.  For more information, visit www.newrelic.com.
+#
+# Generated April 07, 2017, for version 4.0.0.332
+#
+# For full documentation of agent configuration options, please refer to
+# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
+
+common: &default_settings
+  # Required license key associated with your New Relic account.
+  license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %>
+
+  # Your application name. Renaming here affects where data displays in New
+  # Relic.  For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
+  app_name: SciNote
+
+  # To disable the agent regardless of other settings, uncomment the following:
+  # agent_enabled: false
+
+  # Logging level for log/newrelic_agent.log
+  log_level: info
+
+
+# Environment-specific settings are in this section.
+# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.
+# If your application has other named environments, configure them here.
+development:
+  <<: *default_settings
+  app_name: SciNote (Development)
+
+  # NOTE: There is substantial overhead when running in developer mode.
+  # Do not use for production or load testing.
+  developer_mode: true
+
+test:
+  <<: *default_settings
+  # It doesn't make sense to report to New Relic from automated test runs.
+  monitor_mode: false
+
+staging:
+  <<: *default_settings
+  app_name: SciNote (Staging)
+
+production:
+  <<: *default_settings