Skip to content

Commit

Permalink
Fixed serverscript. Fixed tiny bug in user/show when there was no fit…
Browse files Browse the repository at this point in the history
…bit-profile
  • Loading branch information
philippbayer committed Sep 17, 2012
1 parent c5a4fc3 commit d4f0522
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/users/_user_is_user.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="row">
<div class="span3"><h1>Hello <%= @first_name %>!</h1></div>
<div class="row">
<%if @user.fitbit_profile != nil%>
<br/>
<div align="right">
<%if @user.fitbit_profile != nil%>
<%=link_to(image_tag("/images/fitbit-icon.png"),{:controller => "fitbit_profiles", :action => "show", :id => @user.fitbit_profile.id},:rel =>"tooltip",:title => "See your Fitbit data")%>
<%end%>
Expand Down
2 changes: 1 addition & 1 deletion serverscript
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash

screen -d -m -S "Server" bundle exec rails s -e production
screen -d -m -S "Server" bundle exec rails s
screen -d -m -S "Solr" bundle exec rake sunspot:solr:run
screen -d -m -S "Redis" redis-server
screen -d -m -S "Resque-worker" bundle exec rake environment resque:work QUEUE=*
Expand Down

0 comments on commit d4f0522

Please sign in to comment.