Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of https://github.com/charliesome/voze

  • Loading branch information...
commit 85b26ad97dec8d3e7b203f108e3fd255a5994ed2 2 parents 0fee632 + 7661323
Sebastian McKenzie sebmck authored
16 Makefile
... ... @@ -1,16 +0,0 @@
1   -PRODUCTION_HOST=voze.org
2   -PRODUCTION_USER=voze
3   -PRODUCTION_DIR=/srv/http/voze/rails
4   -
5   -deploy:
6   - ssh $(PRODUCTION_USER)@$(PRODUCTION_HOST) \
7   - 'cd $(PRODUCTION_DIR) && git reset --hard HEAD && git pull && make prod-deploy'
8   -
9   -# all targets starting with prod- are intended to be run automatically on the
10   -# production machine. do not run them manually
11   -
12   -prod-deploy:
13   - sudo bundle install
14   - bundle exec rake assets:precompile RAILS_ENV=production
15   - bundle exec rake db:migrate RAILS_ENV=production
16   - touch tmp/restart.txt
2  app/assets/javascripts/sessions.js.coffee
@@ -2,7 +2,7 @@ return false if not do $('section.sessions').size
2 2
3 3 flash = (elem, lag=350, opacity=0.5, times=2, time=75) ->
4 4 next = ->
5   - elem.stop(true).animate opacity: opacity, time, ->
  5 + elem.stop(true).delay(lag).animate opacity: opacity, time, ->
6 6 elem.animate opacity: 1, time, ->
7 7 do next if --times isnt 0
8 8 do next
4 app/helpers/application_helper.rb
@@ -8,4 +8,8 @@ def current_user
8 8 end
9 9 end
10 10 end
  11 +
  12 + def personal_announce_url
  13 + announce_url auth_token: current_user.auth_token
  14 + end
11 15 end
4 app/helpers/versions_helper.rb
... ... @@ -1,8 +1,4 @@
1 1 module VersionsHelper
2   - def personal_announce_url
3   - announce_url auth_token: current_user.auth_token
4   - end
5   -
6 2 def render_metadata(section)
7 3 partial_name = "#{@torrent.metadata.class.name.underscore}/#{section}"
8 4 render partial: partial_name, locals: { metadata: @torrent.metadata }
2  app/views/password_resets/new.html.erb
@@ -7,7 +7,7 @@
7 7 <%= f.text_field :username, placeholder: "Username or email" %>
8 8 </div>
9 9 <footer>
10   - <%= f.submit "Reset", { class: "blue left", id: "session_submit" } %>
  10 + <%= f.submit "Reset", class: "blue left", id: "session_submit" %>
11 11 <div class="icon loading left"></div>
12 12 <%= link_to "Cancel", new_sessions_path, class: "right" %>
13 13 </footer>
2  app/views/sessions/new.html.erb
@@ -21,7 +21,7 @@
21 21 <input type="hidden" name="redirect_to" value="<%= flash[:redirect_to] %>" />
22 22 <% end %>
23 23 <footer>
24   - <%= f.submit "Sign in", { class: "blue left", id: "session_submit" } %>
  24 + <%= f.submit "Sign in", class: "blue left", id: "session_submit" %>
25 25 <div class="icon loading left"></div>
26 26 <%= link_to "Forgot your password?", new_password_reset_path, class: "right" %>
27 27 </footer>
2  app/views/users/new.html.erb
@@ -38,7 +38,7 @@
38 38 <%= f.text_field :invite_code, placeholder: "Invite code" %>
39 39 </div>
40 40 <footer>
41   - <%= f.submit "Sign up", { class: "blue left", id: "session_submit" } %>
  41 + <%= f.submit "Sign up", class: "blue left", id: "session_submit" %>
42 42 <div class="icon loading left"></div>
43 43 <%= link_to "Already have an account?", new_sessions_path, class: "right" %>
44 44 </footer>
17 lib/tasks/deploy.rake
... ... @@ -0,0 +1,17 @@
  1 +task :deploy do
  2 + production_host = "voze.org"
  3 + production_user = "voze"
  4 + production_dir = "/srv/http/voze"
  5 +
  6 + cmds = [
  7 + "cd #{production_dir}",
  8 + "git reset --hard",
  9 + "git pull",
  10 + "sudo bundle install",
  11 + "bundle exec rake assets:precompile RAILS_ENV=production",
  12 + "bundle exec rake db:migrate RAILS_ENV=production",
  13 + "touch tmp/restart.txt"
  14 + ]
  15 +
  16 + system "ssh #{production_user}@#{production_host} '#{cmds.join " && "}'"
  17 +end

0 comments on commit 85b26ad

Please sign in to comment.
Something went wrong with that request. Please try again.