Fix routes.rb require order

This commit is contained in:
Mathieu Magnin 2017-03-15 15:09:43 +01:00
parent 700372231d
commit 6f9edbd36c
3 changed files with 17 additions and 16 deletions

View file

@ -104,7 +104,7 @@ gem 'newrelic_rpm'
gem 'sidekiq' gem 'sidekiq'
gem 'sidekiq-cron', '~> 0.4.4' 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 group :test do
gem 'capybara' gem 'capybara'
@ -130,7 +130,6 @@ group :development do
gem 'web-console' gem 'web-console'
gem 'rack-handlers' gem 'rack-handlers'
gem 'xray-rails' gem 'xray-rails'
gem 'scenic'
end end
group :development, :test do group :development, :test do
@ -161,6 +160,9 @@ group :development, :test do
end end
group :production, :staging do group :production, :staging do
gem 'scenic'
gem 'sentry-raven' gem 'sentry-raven'
end end
group :production, :staging, :development do
gem 'scenic'
end

View file

@ -1,5 +1,14 @@
GIT 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 revision: d0c4053fd459be9f2c207cfeec5c0606461c014b
specs: specs:
rack-protection (2.0.0.rc1) rack-protection (2.0.0.rc1)
@ -10,15 +19,6 @@ GIT
rack-protection (= 2.0.0.rc1) rack-protection (= 2.0.0.rc1)
tilt (~> 2.0) 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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:

View file

@ -47,6 +47,8 @@ Rails.application.routes.draw do
namespace :administrations do namespace :administrations do
resources :stats, only: [:index] resources :stats, only: [:index]
require 'sidekiq/web'
require 'sidekiq/cron/web'
mount Sidekiq::Web => '/sidekiq' mount Sidekiq::Web => '/sidekiq'
end end
end end
@ -211,8 +213,5 @@ Rails.application.routes.draw do
get '/:procedure_path' => '/users/dossiers#commencer' get '/:procedure_path' => '/users/dossiers#commencer'
end end
require 'sidekiq/web'
require 'sidekiq/cron/web'
apipie apipie
end end