nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source
This commit is contained in:
danielvincent 2010-07-02 10:03:36 -07:00
commit d39d02c8ec
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.html.haml
View file

@ -9,7 +9,7 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application" = stylesheet_link_tag "application"
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" /= 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' = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel'
= render 'js/websocket_js' = render 'js/websocket_js'

2
app/views/layouts/session_wall.html.haml
View file

@ -9,7 +9,7 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "sessions" = stylesheet_link_tag "sessions"
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" /= 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 = csrf_meta_tag
= yield(:head) = yield(:head)

2
config/thin.yml
View file

@ -7,7 +7,7 @@ max_conns: 1024
require: [] require: []
max_persistent_conns: 512 max_persistent_conns: 512
environment: production environment: development
servers: 1 servers: 1
daemonize: true daemonize: true
#chdir: /usr/applications/localhash/current #chdir: /usr/applications/localhash/current