diff --git a/app/views/tag_subscriptions/index.html.erb b/app/views/tag_subscriptions/index.html.erb index 03524de06..cc8d132f3 100644 --- a/app/views/tag_subscriptions/index.html.erb +++ b/app/views/tag_subscriptions/index.html.erb @@ -1,7 +1,7 @@

Tag Subscriptions

- +
@@ -12,13 +12,15 @@ <% @tag_subscriptions.each do |tag_subscription| %> - - - + + + <% end %>
Creator
<%= tag_subscription.creator.name %><%= link_to tag_subscription.name, tag_subscription_path(tag_subscription.id) %><%= link_to tag_subscription.tag_query, posts_path(:tags => "sub:#{@user.name}:#{tag_subscription.name}") %><%= link_to tag_subscription.creator.name, user_path(tag_subscription.creator_id) %><%= link_to tag_subscription.name, edit_tag_subscription_path(tag_subscription) %><%= link_to tag_subscription.tag_query, posts_path(:tags => "sub:#{tag_subscription.creator.name}:#{tag_subscription.name}") %>
+ + <%= sequential_paginator(@tag_subscriptions) %>
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 1fa48f7ad..c7b969f4e 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1 +1,2 @@ +set :user, "danbooru" server "testbooru.donmai.us", :web, :app, :db, :primary => true diff --git a/db/seeds.rb b/db/seeds.rb index dbc259d59..96bfbcf4d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,4 +1,5 @@ CurrentUser.ip_addr = "127.0.0.1" +Delayed::Worker.delay_jobs = false if User.count == 0 puts "Creating users" @@ -32,7 +33,7 @@ if Upload.count == 0 url = "http://ipsumimage.appspot.com/#{width}x#{height}" tags = (i * i * i).to_s.scan(/./).uniq.join(" ") - Upload.create(:source => url, :content_type => "image/gif", :rating => "q", :tag_string => tags) + Upload.create(:source => url, :content_type => "image/gif", :rating => "q", :tag_string => tags, :server => Socket.gethostname) end else puts "Skipping uploads"