Merge branch 'develop' into staging
This commit is contained in:
commit
6d6133908e
8 changed files with 106 additions and 46 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -35,3 +35,4 @@ uploads/*
|
||||||
coverage/**/*
|
coverage/**/*
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.byebug_history
|
.byebug_history
|
||||||
|
.env
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -1,6 +1,8 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
|
gem 'dotenv-rails', groups: [:development, :test]
|
||||||
|
|
||||||
gem 'rails', '5.0.0.1'
|
gem 'rails', '5.0.0.1'
|
||||||
|
|
||||||
gem 'actioncable', '5.0.0.1'
|
gem 'actioncable', '5.0.0.1'
|
||||||
|
@ -98,6 +100,8 @@ gem 'browser'
|
||||||
|
|
||||||
gem 'simple_form'
|
gem 'simple_form'
|
||||||
|
|
||||||
|
gem 'newrelic_rpm'
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'capybara'
|
gem 'capybara'
|
||||||
gem 'launchy'
|
gem 'launchy'
|
||||||
|
|
|
@ -130,6 +130,10 @@ GEM
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
domain_name (0.5.20161129)
|
domain_name (0.5.20161129)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
|
dotenv (2.2.0)
|
||||||
|
dotenv-rails (2.2.0)
|
||||||
|
dotenv (= 2.2.0)
|
||||||
|
railties (>= 3.2, < 5.1)
|
||||||
draper (3.0.0.pre1)
|
draper (3.0.0.pre1)
|
||||||
actionpack (~> 5.0)
|
actionpack (~> 5.0)
|
||||||
activemodel (~> 5.0)
|
activemodel (~> 5.0)
|
||||||
|
@ -380,6 +384,7 @@ GEM
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
|
newrelic_rpm (3.18.1.330)
|
||||||
nio4r (1.2.1)
|
nio4r (1.2.1)
|
||||||
nokogiri (1.6.8.1)
|
nokogiri (1.6.8.1)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
|
@ -662,6 +667,7 @@ DEPENDENCIES
|
||||||
database_cleaner
|
database_cleaner
|
||||||
deep_cloneable (~> 2.2.1)
|
deep_cloneable (~> 2.2.1)
|
||||||
devise
|
devise
|
||||||
|
dotenv-rails
|
||||||
draper (~> 3.0.0.pre1)
|
draper (~> 3.0.0.pre1)
|
||||||
factory_girl
|
factory_girl
|
||||||
fog
|
fog
|
||||||
|
@ -682,6 +688,7 @@ DEPENDENCIES
|
||||||
mailjet
|
mailjet
|
||||||
maruku
|
maruku
|
||||||
mina!
|
mina!
|
||||||
|
newrelic_rpm
|
||||||
openid_connect
|
openid_connect
|
||||||
openstack
|
openstack
|
||||||
parallel_tests (~> 2.10)
|
parallel_tests (~> 2.10)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
.card
|
||||||
- unless smart_listing.empty?
|
- unless smart_listing.empty?
|
||||||
%table.table
|
%table.table
|
||||||
%thead
|
%thead
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
%br
|
.container
|
||||||
%br
|
.mt-1
|
||||||
|
|
||||||
= form_for @admin, url: {controller: 'administrations', action: :create} do |f|
|
= form_for @admin, url: {controller: 'administrations', action: :create} do |f|
|
||||||
.form-group.form-inline.center
|
.form-group.form-inline.text-center
|
||||||
= f.text_field :email, placeholder: :email, class: 'form-control'
|
= f.text_field :email, placeholder: :email, class: 'form-control'
|
||||||
= f.text_field :password, placeholder: :password, class: 'form-control'
|
= f.text_field :password, placeholder: :password, class: 'form-control'
|
||||||
|
|
||||||
= f.submit 'Valider', class: 'btn btn-success', id: 'submit_new_administrateur'
|
= f.submit 'Créer un administrateur', class: 'btn btn-success', id: 'submit_new_administrateur'
|
||||||
|
|
||||||
%br
|
.text-center
|
||||||
|
|
||||||
.center
|
|
||||||
=link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block', 'data-no-turbolink': true
|
=link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block', 'data-no-turbolink': true
|
||||||
|
|
||||||
= smart_listing_render :admins
|
= smart_listing_render :admins
|
||||||
|
@ -18,5 +15,5 @@
|
||||||
%br
|
%br
|
||||||
%br
|
%br
|
||||||
|
|
||||||
.center
|
.text-center
|
||||||
=link_to 'Deconnexion', '/administrations/sign_out', method: :delete
|
=link_to 'Deconnexion', '/administrations/sign_out', method: :delete
|
|
@ -3,7 +3,7 @@
|
||||||
.container
|
.container
|
||||||
.stats
|
.stats
|
||||||
.stat-card
|
.stat-card
|
||||||
%h1 Procédures crées
|
%h1 Procédures créées
|
||||||
= line_chart @procedures
|
= line_chart @procedures
|
||||||
|
|
||||||
.stat-card
|
.stat-card
|
||||||
|
|
|
@ -74,6 +74,7 @@ set :shared_paths, [
|
||||||
'public/system',
|
'public/system',
|
||||||
'public/uploads',
|
'public/uploads',
|
||||||
'config/database.yml',
|
'config/database.yml',
|
||||||
|
"config/newrelic.yml",
|
||||||
"config/fog_credentials.yml",
|
"config/fog_credentials.yml",
|
||||||
'config/initializers/secret_token.rb',
|
'config/initializers/secret_token.rb',
|
||||||
'config/initializers/features.yml',
|
'config/initializers/features.yml',
|
||||||
|
|
49
config/newrelic.yml
Normal file
49
config/newrelic.yml
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
#
|
||||||
|
# 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 March 02, 2017
|
||||||
|
#
|
||||||
|
# This configuration file is custom generated for SGMAP
|
||||||
|
#
|
||||||
|
# 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['NEWRELIC_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: Téléprocédure Simplifiée
|
||||||
|
|
||||||
|
# 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: Téléprocédure Simplifiée (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: Téléprocédure Simplifiée (Staging)
|
||||||
|
|
||||||
|
production:
|
||||||
|
<<: *default_settings
|
Loading…
Reference in a new issue