Merge branch 'develop' into list_dossiers_archived

app/controllers/admin/procedures_controller.rb

@@ -181,7 +181,8 @@ class Admin::ProceduresController < AdminController
   def path_list
     render json: ProcedurePath
                      .joins(', procedures')
-                     .where("procedures.id = procedure_paths.procedure_id AND procedures.archived != true")
+                     .where("procedures.id = procedure_paths.procedure_id")
+                     .where("procedures.archived" => false)
                      .where("path LIKE '%#{params[:request]}%'")
                      .pluck(:path, :administrateur_id)
                      .inject([]) {

app/models/notification.rb

@@ -1,5 +1,6 @@
 class Notification < ActiveRecord::Base
   belongs_to :dossier
+  serialize :liste if Rails.env.test?
 
   # after_save :broadcast_notification
 

app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_search.html.haml

@@ -1,2 +1,2 @@
-%div.col-lg-11.col-md-11.col-sm-11.col-xs-11.main-info
+.col-xs-10.main-info
   Recherche dans tous les dossiers

app/views/layouts/navbars/_navbar_default.html.haml

@@ -1 +1 @@
-.col-lg-11.col-md-11.col-sm-11.col-xs-11
+.col-xs-10

app/views/root/landing.html.haml

@@ -57,8 +57,7 @@
       %h3.text-success Usagers
       %h4 Profitez de démarches simplifiées et d’échanges continus avec les services traitants.
       =link_to 'Démonstration', "#{@demo_environment_host}/users/sign_in/demo", {class: 'btn btn-lg btn-success'}
-  %h1
-    = @demo_environment_host
+
   .split-hr-left
 
   .center