diff options
| author | Bruno Perles | 2015-11-09 14:16:42 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-10 15:39:21 +0100 |
| commit | 1ce5304d936d16ea7f1797bc0254fb42b925e6d5 (patch) | |
| tree | 13e270aab3bee503df44c242d952c62aa856291a | |
| parent | 59828c2de43d470023eba9f6f52f0ea2dec00228 (diff) | |
| download | chouette-core-1ce5304d936d16ea7f1797bc0254fb42b925e6d5.tar.bz2 | |
Update Newrelic and fix #0040441
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_route_popover.html.erb | 2 | ||||
| -rw-r--r-- | config/newrelic.yml | 2 | ||||
| -rw-r--r-- | config/secrets.yml | 3 |
5 files changed, 7 insertions, 5 deletions
@@ -104,6 +104,8 @@ gem 'delayed_job_active_record' gem 'devise-async' gem 'apartment', '~> 1.0.0' +gem 'newrelic_rpm' + group :development do gem 'capistrano', '2.13.5' gem 'capistrano-ext' @@ -138,7 +140,6 @@ end group :production do gem 'SyslogLogger', require: 'syslog/logger' gem 'daemons' - gem 'newrelic_rpm' end # I18n diff --git a/Gemfile.lock b/Gemfile.lock index ea4a0cba6..590b13326 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM net-ssh (2.9.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - newrelic_rpm (3.9.6.257) + newrelic_rpm (3.11.2.286) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nokogiri (1.6.6.2-java) diff --git a/app/views/vehicle_journeys/_route_popover.html.erb b/app/views/vehicle_journeys/_route_popover.html.erb index 27023b625..7a8ad5730 100644 --- a/app/views/vehicle_journeys/_route_popover.html.erb +++ b/app/views/vehicle_journeys/_route_popover.html.erb @@ -1,5 +1,5 @@ <ul> <% (selected_route.line.routes.limit(10).reject{ |route| route == selected_route}).each do |route| %> - <li><%= link_to route.name.truncate(30), [@referential, route.line, route, controller_name] %></li> + <li><%= link_to (route.name ? route.name.truncate(30) : '-' ), [@referential, route.line, route, controller_name] %></li> <% end %> </ul> diff --git a/config/newrelic.yml b/config/newrelic.yml index 8473d5e01..b68e5c5ca 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -12,7 +12,7 @@ common: &default_settings # Required license key associated with your New Relic account. - license_key: Rails.application.secrets.newrelic_licence_key + license_key: <%= Rails.application.secrets.newrelic_licence_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 diff --git a/config/secrets.yml b/config/secrets.yml index 0900478f7..8b1ad59e2 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -15,6 +15,7 @@ development: api_endpoint: "http://localhost:8080/chouette_iev/" google_analytic_tracker: "UA-AAAAAAAA" # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" + newrelic_licence_key: "" test: secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a @@ -29,4 +30,4 @@ production: api_endpoint: "http://localhost:8080/chouette_iev/" google_analytic_tracker: "UA-AAAAAAAA" # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" - newrelic_licence_key: "aaaaaaaaaaaaaaaaaaaaaaaaaa" + newrelic_licence_key: "" |