DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-06-03 11:19:10 +02:00
commit 1b36598391
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/ping_controller.rb Normal file
View file

@ -0,0 +1,11 @@
class PingController < ApplicationController
def index
if (ActiveRecord::Base.connected?)
render nothing: true, status: 200, content_type: "application/json"
else
render nothing: true, status: 500, content_type: "application/json"
end
end
end

1
app/views/administrateurs/sessions/new.html.haml
View file

@ -1,4 +1,5 @@
#form_login #form_login
%br
= image_tag('logo-tps.png') = image_tag('logo-tps.png')
%br %br
%h2#login_admin Administration %h2#login_admin Administration

1
app/views/gestionnaires/sessions/new.html.haml
View file

@ -1,4 +1,5 @@
#form_login #form_login
%br
= image_tag('logo-tps.png') = image_tag('logo-tps.png')
%br %br
%h2#gestionnaire_login Accompagnateur %h2#gestionnaire_login Accompagnateur

2
config/routes.rb
View file

@ -1,5 +1,7 @@
Rails.application.routes.draw do Rails.application.routes.draw do
get "/ping" => "ping#index", :constraints => {:ip => /127.0.0.1/}
devise_for :administrations, skip: [:password, :registrations] devise_for :administrations, skip: [:password, :registrations]
devise_for :administrateurs, controllers: { devise_for :administrateurs, controllers: {