From 6f9edbd36ca4634205627682ce465bc5827d8640 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Wed, 15 Mar 2017 15:09:43 +0100
Subject: [PATCH] Fix routes.rb require order

---
 Gemfile          |  8 +++++---
 Gemfile.lock     | 20 ++++++++++----------
 config/routes.rb |  5 ++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index b7f030edc..bb8cc7dfd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,7 +104,7 @@ gem 'newrelic_rpm'
 
 gem 'sidekiq'
 gem 'sidekiq-cron', '~> 0.4.4'
-gem 'sinatra', github: 'sinatra', require: false
+gem 'sinatra', git: 'https://github.com/sinatra/sinatra.git', require: false
 
 group :test do
   gem 'capybara'
@@ -130,7 +130,6 @@ group :development do
   gem 'web-console'
   gem 'rack-handlers'
   gem 'xray-rails'
-  gem 'scenic'
 end
 
 group :development, :test do
@@ -161,6 +160,9 @@ group :development, :test do
 end
 
 group :production, :staging do
-  gem 'scenic'
   gem 'sentry-raven'
 end
+
+group :production, :staging, :development do
+  gem 'scenic'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index facff428a..e13984e7c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,14 @@
 GIT
-  remote: git://github.com/sinatra/sinatra.git
+  remote: https://github.com/mina-deploy/mina.git
+  revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a
+  ref: 343a7
+  specs:
+    mina (0.3.8)
+      open4 (~> 1.3.4)
+      rake
+
+GIT
+  remote: https://github.com/sinatra/sinatra.git
   revision: d0c4053fd459be9f2c207cfeec5c0606461c014b
   specs:
     rack-protection (2.0.0.rc1)
@@ -10,15 +19,6 @@ GIT
       rack-protection (= 2.0.0.rc1)
       tilt (~> 2.0)
 
-GIT
-  remote: https://github.com/mina-deploy/mina.git
-  revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a
-  ref: 343a7
-  specs:
-    mina (0.3.8)
-      open4 (~> 1.3.4)
-      rake
-
 GEM
   remote: https://rubygems.org/
   specs:
diff --git a/config/routes.rb b/config/routes.rb
index 922131897..5811b4890 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -47,6 +47,8 @@ Rails.application.routes.draw do
     namespace :administrations do
       resources :stats, only: [:index]
 
+      require 'sidekiq/web'
+      require 'sidekiq/cron/web'
       mount Sidekiq::Web => '/sidekiq'
     end
   end
@@ -211,8 +213,5 @@ Rails.application.routes.draw do
     get '/:procedure_path' => '/users/dossiers#commencer'
   end
 
-  require 'sidekiq/web'
-  require 'sidekiq/cron/web'
-
   apipie
 end