summaryrefslogtreecommitdiff
path: root/config.ru
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2016-11-24 16:31:26 +0000
committergebele <gebele@in-silico.ch>2016-11-24 16:31:26 +0000
commitbfd31ed2c9d0cde8a53238c7368eb3d49c580b7d (patch)
tree91c3a2865302e1017db0dffb6015dfa3eb6c476f /config.ru
parentf0588c7e072ea3e22f26916d669e9baaa8fa3197 (diff)
parentf86c084311282036ffa7b4588c0fa0d5b59af95b (diff)
fixed merge
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.ru b/config.ru
index 3e82e35..7ee908a 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,6 @@
-SERVICE = "lazar"
+ENV["LAZAR_ENV"] = "development"
require 'bundler'
Bundler.require
require File.expand_path './application.rb'
+require "sinatra/reloader" if development?
run Sinatra::Application