diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 36af0216f..9bd3c7f9d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,7 +9,7 @@ = stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "application" /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" - = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'google_a' + = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'google' = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel' = render 'js/websocket_js' diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 5bdf2d6ce..f4b13e524 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -9,7 +9,7 @@ = stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "sessions" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" - = javascript_include_tag 'jquery142' + = javascript_include_tag 'jquery142', 'google' = csrf_meta_tag = yield(:head) diff --git a/config/thin.yml b/config/thin.yml index f60fed103..c46f482c2 100644 --- a/config/thin.yml +++ b/config/thin.yml @@ -7,7 +7,7 @@ max_conns: 1024 require: [] max_persistent_conns: 512 -environment: production +environment: development servers: 1 daemonize: true #chdir: /usr/applications/localhash/current