Permalink
Browse files

Knew that would happen.

  • Loading branch information...
1 parent 7ddfc5d commit e4b29ce3858b816e4c48a1ace4c5d428ad850ba5 @sudara committed Feb 13, 2013
Showing with 3 additions and 11 deletions.
  1. +1 −1 app/views/playlists/_playlist_layout.erb
  2. +2 −10 deploy
@@ -2,7 +2,7 @@
<% div_for @playlist, :class => "box #{(@playlist.has_tracks? ? '' : 'empty')} #{@playlist.type}" do %>
<div class="playlist_title box">
- <h2><%= h(@playlist.title)+@playlist.year.present? ? " (#{@playlist.year})" : '') %></h2>
+ <h2><%= h(@playlist.title)+ (@playlist.year.present? ? " (#{@playlist.year})" : '') %></h2>
<h3><%= pluralize @playlist.tracks_count, 'track'%> by <%= (@playlist.is_mix? ? 'various alonetone artists' : @playlist.user.name )%></h3>
<% if authorized_for(@playlist) %>
<%= link_to "edit", edit_user_playlist_path(@user, @playlist), :class => 'edit right' %>
View
12 deploy
@@ -16,16 +16,8 @@ ssh alonetone '
git fetch;
- if [[ $(git diff origin/rails2 Gemfile) > "" ]];
- then
- echo "Gemfile changed, bundle installing...";
- git reset --hard origin/rails2; bundle install --deployment;
- echo
- else
- echo "skipping bundle install, gemfile has not changed since last time.";
- git reset --hard origin/rails2;
- echo
- fi
+ git reset --hard origin/rails2; bundle install --deployment;
+
rm -f /data/alonetone/current/public/javascripts/allonetone.js
rm -f /data/alonetone/current/public/stylesheets/alonetone-v2.css

0 comments on commit e4b29ce

Please sign in to comment.