Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

turbolinks go

  • Loading branch information...
commit bb36b5234bfd31413d7d470fb23ded3244c656f6 1 parent 73a16de
@jodyalbritton authored
Showing with 115 additions and 20,492 deletions.
  1. +1 −0  Gemfile
  2. +2 −0  Gemfile.lock
  3. +1 −0  app/assets/javascripts/application.js
  4. +5 −3 app/assets/stylesheets/application.css.less
  5. +2 −2 app/helpers/likes_helper.rb
  6. +8 −4 app/models/activity.rb
  7. +6 −3 app/models/circle.rb
  8. +4 −2 app/models/follow.rb
  9. +7 −6 app/models/group.rb
  10. +5 −2 app/models/membership.rb
  11. +6 −1 app/models/message.rb
  12. +1 −17 app/models/post.rb
  13. +6 −6 app/views/activities/_index.html.erb
  14. +10 −13 app/views/activities/_likes.html.erb
  15. +12 −41 app/views/activities/_post.html.erb
  16. +3 −11 app/views/circles/_form.html.erb
  17. +26 −36 app/views/circles/index.html.erb
  18. +4 −4 app/views/devise/registrations/edit.html.erb
  19. +1 −1  app/views/follows/_follow.html.erb
  20. +2 −2 app/views/follows/_follow_user.html.erb
  21. +1 −1  app/views/follows/_unfollow.html.erb
  22. +0 −15 app/views/users/confirmations/new.html.erb
  23. +0 −5 app/views/users/mailer/confirmation_instructions.html.erb
  24. +0 −8 app/views/users/mailer/reset_password_instructions.html.erb
  25. +0 −7 app/views/users/mailer/unlock_instructions.html.erb
  26. +0 −19 app/views/users/passwords/edit.html.erb
  27. +0 −15 app/views/users/passwords/new.html.erb
  28. +0 −22 app/views/users/registrations/edit.html.erb
  29. +0 −19 app/views/users/registrations/new.html.erb
  30. +0 −15 app/views/users/sessions/new.html.erb
  31. +0 −25 app/views/users/shared/_links.erb
  32. +2 −2 app/views/users/show.html.erb
  33. +0 −15 app/views/users/unlocks/new.html.erb
  34. +0 −23 vendor/bundle/ruby/1.9.1/bin/autospec
  35. +0 −23 vendor/bundle/ruby/1.9.1/bin/cucumber
  36. +0 −23 vendor/bundle/ruby/1.9.1/bin/erubis
  37. +0 −23 vendor/bundle/ruby/1.9.1/bin/heroku
  38. +0 −25 vendor/bundle/ruby/1.9.1/bin/htmldiff
  39. +0 −23 vendor/bundle/ruby/1.9.1/bin/launchy
  40. +0 −25 vendor/bundle/ruby/1.9.1/bin/ldiff
  41. +0 −23 vendor/bundle/ruby/1.9.1/bin/lessc
  42. +0 −23 vendor/bundle/ruby/1.9.1/bin/nokogiri
  43. +0 −23 vendor/bundle/ruby/1.9.1/bin/oauth
  44. +0 −23 vendor/bundle/ruby/1.9.1/bin/rackup
  45. +0 −23 vendor/bundle/ruby/1.9.1/bin/rails
  46. +0 −23 vendor/bundle/ruby/1.9.1/bin/rake
  47. +0 −23 vendor/bundle/ruby/1.9.1/bin/rake2thor
  48. +0 −23 vendor/bundle/ruby/1.9.1/bin/rdoc
  49. +0 −23 vendor/bundle/ruby/1.9.1/bin/restclient
  50. +0 −23 vendor/bundle/ruby/1.9.1/bin/ri
  51. +0 −23 vendor/bundle/ruby/1.9.1/bin/rspec
  52. +0 −23 vendor/bundle/ruby/1.9.1/bin/therubyracer
  53. +0 −23 vendor/bundle/ruby/1.9.1/bin/thin
  54. +0 −23 vendor/bundle/ruby/1.9.1/bin/thor
  55. +0 −23 vendor/bundle/ruby/1.9.1/bin/tilt
  56. +0 −23 vendor/bundle/ruby/1.9.1/bin/tt
  57. +0 −1  vendor/bundle/ruby/1.9.1/bundler/gems/client_side_validations-192002036565
  58. +0 −1  vendor/bundle/ruby/1.9.1/bundler/gems/rails3-jquery-autocomplete-05c506848a49
  59. BIN  vendor/bundle/ruby/1.9.1/cache/actionmailer-3.2.8.gem
  60. BIN  vendor/bundle/ruby/1.9.1/cache/actionpack-3.2.8.gem
  61. BIN  vendor/bundle/ruby/1.9.1/cache/activemodel-3.2.8.gem
  62. BIN  vendor/bundle/ruby/1.9.1/cache/activerecord-3.2.8.gem
  63. BIN  vendor/bundle/ruby/1.9.1/cache/activeresource-3.2.8.gem
  64. BIN  vendor/bundle/ruby/1.9.1/cache/activesupport-3.2.8.gem
  65. BIN  vendor/bundle/ruby/1.9.1/cache/acts_as_follower-0.1.1.gem
  66. BIN  vendor/bundle/ruby/1.9.1/cache/addressable-2.3.2.gem
  67. BIN  vendor/bundle/ruby/1.9.1/cache/arel-3.0.2.gem
  68. BIN  vendor/bundle/ruby/1.9.1/cache/bcrypt-ruby-3.0.1.gem
  69. BIN  vendor/bundle/ruby/1.9.1/cache/best_in_place-1.1.2.gem
  70. BIN  vendor/bundle/ruby/1.9.1/cache/builder-3.0.3.gem
  71. BIN  vendor/bundle/ruby/1.9.1/cache/bullet-4.1.6.gem
  72. +0 −1  ...r/bundle/ruby/1.9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/HEAD
  73. +0 −6 ...bundle/ruby/1.9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/config
  74. +0 −1  ...e/ruby/1.9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/description
  75. +0 −15 ...he/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/applypatch-msg.sample
  76. +0 −24 .../cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/commit-msg.sample
  77. +0 −8 ...cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/post-update.sample
  78. +0 −14 ...he/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-applypatch.sample
  79. +0 −50 .../cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-commit.sample
  80. +0 −169 .../cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-rebase.sample
  81. +0 −36 ...undler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/prepare-commit-msg.sample
  82. +0 −128 ....9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/update.sample
  83. +0 −6 .../ruby/1.9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/info/exclude
  84. BIN  ...ons-1f04c5ec97583337510881f8ffe18e720a45ff58/objects/pack/pack-950478d0ea4144b39ceb29712b060030218189b3.idx
  85. BIN  ...ns-1f04c5ec97583337510881f8ffe18e720a45ff58/objects/pack/pack-950478d0ea4144b39ceb29712b060030218189b3.pack
  86. +0 −98 ...e/ruby/1.9.1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/packed-refs
  87. +0 −1  ...undle/ruby/1.9.1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/HEAD
  88. +0 −6 ...dle/ruby/1.9.1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/config
  89. +0 −1  ...uby/1.9.1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/description
  90. +0 −15 ...bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/applypatch-msg.sample
  91. +0 −24 ...che/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/commit-msg.sample
  92. +0 −8 ...he/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/post-update.sample
  93. +0 −14 ...bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/pre-applypatch.sample
  94. +0 −50 ...che/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/pre-commit.sample
  95. +0 −169 ...che/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/pre-rebase.sample
  96. +0 −36 ...ler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/prepare-commit-msg.sample
  97. +0 −128 ...1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/hooks/update.sample
  98. +0 −6 ...by/1.9.1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/info/exclude
  99. BIN  ...ete-92c13365e8f2c5eca501e173e007d3e403a7b163/objects/pack/pack-ac3647a7b360f6ea982a90f43da74b0a146260a9.idx
  100. BIN  ...te-92c13365e8f2c5eca501e173e007d3e403a7b163/objects/pack/pack-ac3647a7b360f6ea982a90f43da74b0a146260a9.pack
  101. +0 −69 ...uby/1.9.1/cache/bundler/git/rails3-jquery-autocomplete-92c13365e8f2c5eca501e173e007d3e403a7b163/packed-refs
  102. BIN  vendor/bundle/ruby/1.9.1/cache/cancan-1.6.8.gem
  103. BIN  vendor/bundle/ruby/1.9.1/cache/capybara-1.1.2.gem
  104. BIN  vendor/bundle/ruby/1.9.1/cache/carrierwave-0.6.2.gem
  105. BIN  vendor/bundle/ruby/1.9.1/cache/childprocess-0.3.5.gem
  106. BIN  vendor/bundle/ruby/1.9.1/cache/coffee-rails-3.2.2.gem
  107. BIN  vendor/bundle/ruby/1.9.1/cache/coffee-script-2.2.0.gem
  108. BIN  vendor/bundle/ruby/1.9.1/cache/coffee-script-source-1.3.3.gem
  109. BIN  vendor/bundle/ruby/1.9.1/cache/commonjs-0.2.6.gem
  110. BIN  vendor/bundle/ruby/1.9.1/cache/connection_pool-0.9.2.gem
  111. BIN  vendor/bundle/ruby/1.9.1/cache/cucumber-1.2.1.gem
  112. BIN  vendor/bundle/ruby/1.9.1/cache/cucumber-rails-1.3.0.gem
  113. BIN  vendor/bundle/ruby/1.9.1/cache/daemons-1.1.9.gem
  114. BIN  vendor/bundle/ruby/1.9.1/cache/database_cleaner-0.8.0.gem
  115. BIN  vendor/bundle/ruby/1.9.1/cache/devise-2.1.2.gem
  116. BIN  vendor/bundle/ruby/1.9.1/cache/devise_invitable-1.1.0.gem
  117. BIN  vendor/bundle/ruby/1.9.1/cache/diff-lcs-1.1.3.gem
  118. BIN  vendor/bundle/ruby/1.9.1/cache/email_spec-1.2.1.gem
  119. BIN  vendor/bundle/ruby/1.9.1/cache/erubis-2.7.0.gem
  120. BIN  vendor/bundle/ruby/1.9.1/cache/eventmachine-1.0.0.gem
  121. BIN  vendor/bundle/ruby/1.9.1/cache/excon-0.16.4.gem
  122. BIN  vendor/bundle/ruby/1.9.1/cache/execjs-1.4.0.gem
  123. BIN  vendor/bundle/ruby/1.9.1/cache/faker-1.1.2.gem
  124. BIN  vendor/bundle/ruby/1.9.1/cache/faraday-0.8.4.gem
  125. BIN  vendor/bundle/ruby/1.9.1/cache/ffi-1.1.5.gem
  126. BIN  vendor/bundle/ruby/1.9.1/cache/friendly_id-4.0.8.gem
  127. BIN  vendor/bundle/ruby/1.9.1/cache/gherkin-2.11.2.gem
  128. BIN  vendor/bundle/ruby/1.9.1/cache/girl_friday-0.10.0.gem
  129. BIN  vendor/bundle/ruby/1.9.1/cache/hashie-1.2.0.gem
  130. BIN  vendor/bundle/ruby/1.9.1/cache/heroku-2.32.6.gem
  131. BIN  vendor/bundle/ruby/1.9.1/cache/heroku-api-0.3.5.gem
  132. BIN  vendor/bundle/ruby/1.9.1/cache/hike-1.2.1.gem
  133. BIN  vendor/bundle/ruby/1.9.1/cache/httpauth-0.2.0.gem
  134. BIN  vendor/bundle/ruby/1.9.1/cache/i18n-0.6.1.gem
  135. BIN  vendor/bundle/ruby/1.9.1/cache/journey-1.0.4.gem
  136. BIN  vendor/bundle/ruby/1.9.1/cache/jquery-rails-2.1.3.gem
  137. BIN  vendor/bundle/ruby/1.9.1/cache/jquery-ui-rails-2.0.1.gem
  138. BIN  vendor/bundle/ruby/1.9.1/cache/json-1.7.5.gem
  139. BIN  vendor/bundle/ruby/1.9.1/cache/jwt-0.1.5.gem
  140. BIN  vendor/bundle/ruby/1.9.1/cache/keytar-1.5.3.gem
  141. BIN  vendor/bundle/ruby/1.9.1/cache/launchy-2.1.2.gem
  142. BIN  vendor/bundle/ruby/1.9.1/cache/less-2.2.2.gem
  143. BIN  vendor/bundle/ruby/1.9.1/cache/less-rails-2.2.3.gem
  144. BIN  vendor/bundle/ruby/1.9.1/cache/libv8-3.3.10.4-x86-linux.gem
  145. BIN  vendor/bundle/ruby/1.9.1/cache/libwebsocket-0.1.5.gem
  146. BIN  vendor/bundle/ruby/1.9.1/cache/likeable-0.1.2.gem
  147. BIN  vendor/bundle/ruby/1.9.1/cache/mail-2.4.4.gem
  148. BIN  vendor/bundle/ruby/1.9.1/cache/mime-types-1.19.gem
  149. BIN  vendor/bundle/ruby/1.9.1/cache/multi_json-1.3.6.gem
  150. BIN  vendor/bundle/ruby/1.9.1/cache/multipart-post-1.1.5.gem
  151. BIN  vendor/bundle/ruby/1.9.1/cache/netrc-0.7.7.gem
  152. BIN  vendor/bundle/ruby/1.9.1/cache/nokogiri-1.5.5.gem
  153. BIN  vendor/bundle/ruby/1.9.1/cache/oauth-0.4.7.gem
  154. BIN  vendor/bundle/ruby/1.9.1/cache/oauth2-0.8.0.gem
  155. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-1.1.1.gem
  156. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-facebook-1.4.1.gem
  157. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-oauth-1.0.1.gem
  158. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-oauth2-1.1.1.gem
  159. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-openid-1.0.1.gem
  160. BIN  vendor/bundle/ruby/1.9.1/cache/omniauth-twitter-0.0.13.gem
  161. BIN  vendor/bundle/ruby/1.9.1/cache/orm_adapter-0.4.0.gem
  162. BIN  vendor/bundle/ruby/1.9.1/cache/pg-0.14.0.gem
  163. BIN  vendor/bundle/ruby/1.9.1/cache/polyglot-0.3.3.gem
  164. BIN  vendor/bundle/ruby/1.9.1/cache/rack-1.4.1.gem
  165. BIN  vendor/bundle/ruby/1.9.1/cache/rack-cache-1.2.gem
  166. BIN  vendor/bundle/ruby/1.9.1/cache/rack-openid-1.3.1.gem
  167. BIN  vendor/bundle/ruby/1.9.1/cache/rack-ssl-1.3.2.gem
  168. BIN  vendor/bundle/ruby/1.9.1/cache/rack-test-0.6.1.gem
  169. BIN  vendor/bundle/ruby/1.9.1/cache/rails-3.2.8.gem
  170. BIN  vendor/bundle/ruby/1.9.1/cache/railties-3.2.8.gem
  171. BIN  vendor/bundle/ruby/1.9.1/cache/rake-0.9.2.2.gem
  172. BIN  vendor/bundle/ruby/1.9.1/cache/rdoc-3.12.gem
  173. BIN  vendor/bundle/ruby/1.9.1/cache/redis-3.0.1.gem
  174. BIN  vendor/bundle/ruby/1.9.1/cache/remotipart-1.0.2.gem
  175. BIN  vendor/bundle/ruby/1.9.1/cache/rest-client-1.6.7.gem
  176. BIN  vendor/bundle/ruby/1.9.1/cache/rmagick-2.13.1.gem
  177. BIN  vendor/bundle/ruby/1.9.1/cache/rolify-3.2.0.gem
  178. BIN  vendor/bundle/ruby/1.9.1/cache/rspec-2.11.0.gem
  179. BIN  vendor/bundle/ruby/1.9.1/cache/rspec-core-2.11.1.gem
  180. BIN  vendor/bundle/ruby/1.9.1/cache/rspec-expectations-2.11.3.gem
  181. BIN  vendor/bundle/ruby/1.9.1/cache/rspec-mocks-2.11.3.gem
  182. BIN  vendor/bundle/ruby/1.9.1/cache/rspec-rails-2.11.0.gem
  183. BIN  vendor/bundle/ruby/1.9.1/cache/ruby-openid-2.2.0.gem
  184. BIN  vendor/bundle/ruby/1.9.1/cache/rubyzip-0.9.9.gem
  185. BIN  vendor/bundle/ruby/1.9.1/cache/selenium-webdriver-2.25.0.gem
  186. BIN  vendor/bundle/ruby/1.9.1/cache/simple_form-2.0.2.gem
  187. BIN  vendor/bundle/ruby/1.9.1/cache/sprockets-2.1.3.gem
  188. BIN  vendor/bundle/ruby/1.9.1/cache/therubyracer-0.10.2.gem
  189. BIN  vendor/bundle/ruby/1.9.1/cache/thin-1.5.0.gem
  190. BIN  vendor/bundle/ruby/1.9.1/cache/thor-0.16.0.gem
  191. BIN  vendor/bundle/ruby/1.9.1/cache/tilt-1.3.3.gem
  192. BIN  vendor/bundle/ruby/1.9.1/cache/treetop-1.4.10.gem
  193. BIN  vendor/bundle/ruby/1.9.1/cache/twitter-bootstrap-rails-2.1.3.gem
  194. BIN  vendor/bundle/ruby/1.9.1/cache/tzinfo-0.3.33.gem
  195. BIN  vendor/bundle/ruby/1.9.1/cache/uglifier-1.3.0.gem
  196. BIN  vendor/bundle/ruby/1.9.1/cache/uniform_notifier-1.0.2.gem
  197. BIN  vendor/bundle/ruby/1.9.1/cache/warden-1.2.1.gem
  198. BIN  vendor/bundle/ruby/1.9.1/cache/will_paginate-3.0.3.gem
  199. BIN  vendor/bundle/ruby/1.9.1/cache/xpath-0.1.4.gem
  200. +0 −494 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/CHANGELOG.md
  201. +0 −21 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/MIT-LICENSE
  202. +0 −163 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/README.rdoc
  203. +0 −49 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer.rb
  204. +0 −737 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/base.rb
  205. +0 −30 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/collector.rb
  206. +0 −86 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/delivery_methods.rb
  207. +0 −22 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/log_subscriber.rb
  208. +0 −56 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/mail_helper.rb
  209. +0 −44 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/railtie.rb
  210. +0 −82 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/test_case.rb
  211. +0 −61 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/test_helper.rb
  212. +0 −10 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/version.rb
  213. +0 −18 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/rails/generators/mailer/USAGE
  214. +0 −16 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/rails/generators/mailer/mailer_generator.rb
  215. +0 −18 vendor/bundle/ruby/1.9.1/gems/actionmailer-3.2.8/lib/rails/generators/mailer/templates/mailer.rb
  216. +0 −5,973 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/CHANGELOG.md
  217. +0 −21 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/MIT-LICENSE
  218. +0 −341 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/README.rdoc
  219. +0 −28 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller.rb
  220. +0 −10 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/asset_paths.rb
  221. +0 −213 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/base.rb
  222. +0 −198 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/callbacks.rb
  223. +0 −32 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/collector.rb
  224. +0 −167 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/helpers.rb
  225. +0 −423 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/layouts.rb
  226. +0 −13 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/logger.rb
  227. +0 −18 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/railties/routes_helpers.rb
  228. +0 −179 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/rendering.rb
  229. +0 −13 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/translation.rb
  230. +0 −33 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/url_for.rb
  231. +0 −96 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/abstract_controller/view_paths.rb
  232. +0 −65 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller.rb
  233. +0 −235 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/base.rb
  234. +0 −86 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/caching.rb
  235. +0 −185 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/caching/actions.rb
  236. +0 −127 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/caching/fragments.rb
  237. +0 −187 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/caching/pages.rb
  238. +0 −97 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/caching/sweeping.rb
  239. +0 −3  vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/deprecated.rb
  240. +0 −2  vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/deprecated/integration_test.rb
  241. +0 −1  vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/deprecated/performance_test.rb
  242. +0 −66 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/log_subscriber.rb
  243. +0 −250 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal.rb
  244. +0 −64 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/compatibility.rb
  245. +0 −131 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/conditional_get.rb
  246. +0 −16 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/cookies.rb
  247. +0 −157 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/data_streaming.rb
  248. +0 −46 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/exceptions.rb
  249. +0 −28 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/flash.rb
  250. +0 −39 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/force_ssl.rb
  251. +0 −35 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/head.rb
  252. +0 −113 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/helpers.rb
  253. +0 −47 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/hide_actions.rb
  254. +0 −466 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/http_authentication.rb
  255. +0 −19 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/implicit_render.rb
  256. +0 −105 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/instrumentation.rb
  257. +0 −317 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/mime_responds.rb
  258. +0 −240 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/params_wrapper.rb
  259. +0 −26 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/rack_delegation.rb
  260. +0 −109 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/redirecting.rb
  261. +0 −109 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/renderers.rb
  262. +0 −65 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/rendering.rb
  263. +0 −113 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/request_forgery_protection.rb
  264. +0 −35 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/rescue.rb
  265. +0 −286 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/responder.rb
  266. +0 −14 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/session_management.rb
  267. +0 −229 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/streaming.rb
  268. +0 −37 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/testing.rb
  269. +0 −47 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/metal/url_for.rb
  270. +0 −39 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/middleware.rb
  271. +0 −51 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/railtie.rb
  272. +0 −25 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/railties/paths.rb
  273. +0 −85 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/record_identifier.rb
  274. +0 −554 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/test_case.rb
  275. +0 −20 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner.rb
  276. +0 −68 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/document.rb
  277. +0 −532 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/node.rb
  278. +0 −177 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
  279. +0 −830 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/selector.rb
  280. +0 −107 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
  281. +0 −11 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_controller/vendor/html-scanner/html/version.rb
  282. +0 −102 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch.rb
  283. +0 −123 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/cache.rb
  284. +0 −70 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/filter_parameters.rb
  285. +0 −31 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/headers.rb
  286. +0 −110 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/mime_negotiation.rb
  287. +0 −276 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/mime_type.rb
  288. +0 −35 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/mime_types.rb
  289. +0 −74 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/parameter_filter.rb
  290. +0 −83 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/parameters.rb
  291. +0 −62 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/rack_cache.rb
  292. +0 −281 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/request.rb
  293. +0 −206 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/response.rb
  294. +0 −47 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/upload.rb
  295. +0 −174 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/http/url.rb
  296. +0 −22 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/middleware/best_standards_support.rb
  297. +0 −30 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/middleware/body_proxy.rb
  298. +0 −32 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/middleware/callbacks.rb
  299. +0 −351 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/middleware/cookies.rb
  300. +0 −82 vendor/bundle/ruby/1.9.1/gems/actionpack-3.2.8/lib/action_dispatch/middleware/debug_exceptions.rb
Sorry, we could not display the entire diff because too many files (10,182) changed.
View
1  Gemfile
@@ -43,6 +43,7 @@ gem 'remotipart'
gem 'girl_friday'
gem 'heroku'
gem 'fog'
+gem 'turbolinks'
group :development do
gem 'bullet'
View
2  Gemfile.lock
@@ -275,6 +275,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ turbolinks (0.1.5)
twitter-bootstrap-rails (2.1.3)
actionpack (>= 3.1)
less-rails (~> 2.2.3)
@@ -332,6 +333,7 @@ DEPENDENCIES
simple_form
therubyracer
thin
+ turbolinks
twitter-bootstrap-rails
uglifier (>= 1.0.3)
will_paginate
View
1  app/assets/javascripts/application.js
@@ -19,6 +19,7 @@
//= require rails.validations
//= require jquery.tokeninput
//= require jquery.remotipart
+//= require turbolinks
//= require_tree .
// Search form.
View
8 app/assets/stylesheets/application.css.less
@@ -537,6 +537,7 @@ min-height: 40px;
.users-list {
min-height: 120px;
+ border: 1px solid #E3E3E3;
}
.list-username {
text-align: center;
@@ -554,15 +555,16 @@ min-height: 40px;
}
.user-item-main{
+
text-align: center;
- border-right: 1px solid #E3E3E3;
+
}
.item-user{
- border-top: 1px solid #E3E3E3;
-
+ padding-top: 10px;
+ border-bottom: 1px solid #E3E3E3;
}
/****************************************************************
View
4 app/helpers/likes_helper.rb
@@ -1,10 +1,10 @@
module LikesHelper
def like_link_for(target)
- link_to "Give Props", like_path(:resource_name => target.class, :resource_id => target.id), :method => :post,:remote => true, :class => "icon-thumbs-up"
+ link_to "Give Props", like_path(:resource_name => target.class, :resource_id => target.id), :"data-no-turbolink"=>true, :method => :post,:remote => true, :class => "icon-thumbs-up"
end
def unlike_link_for(target)
- link_to "Undo Props", like_path(:resource_name => target.class, :resource_id => target.id), :method => :delete,:remote => true, :class => "icon-thumbs-down"
+ link_to "Undo Props", like_path(:resource_name => target.class, :resource_id => target.id), :"data-no-turbolink"=>true, :method => :delete,:remote => true, :class => "icon-thumbs-down"
end
end
View
12 app/models/activity.rb
@@ -1,20 +1,24 @@
class Activity < ActiveRecord::Base
-#feilds accesible
- attr_accessible :user, :target_id, :activity_type, :created_at, :updated_at, :target_type, :parent_id, :verb, :scope, :tag_list
+
+ #fields accesible
+ attr_accessible :user, :target_id, :activity_type, :created_at, :updated_at, :target_type, :parent_id, :verb, :scope, :tag_list
-#relations for the activity
+ #relations for the activity
belongs_to :user
belongs_to :target, :polymorphic => true
has_many :replies, :class_name => "Post", :foreign_key => "reply_to_id"
has_and_belongs_to_many :tags
+
+ #default scope and set per page limit for will_paginate
default_scope :order => 'activities.created_at DESC'
self.per_page = 10
+ #set the partial path for the observer
def to_partial_path()
"activities/#{target_type.downcase}"
end
- #actions
+ #Flatten, generate and process tags.
serialize :tag_list
before_save :generate_taglist
after_commit :process_tags
View
9 app/models/circle.rb
@@ -1,17 +1,20 @@
class Circle < ActiveRecord::Base
-
+ #fields accessible
attr_accessible :description, :name, :user_tokens
+ #set attribute reader
+ attr_reader :user_tokens
+ #relationships
belongs_to :author, :class_name => 'User'
-
has_many :relationships
has_many :users, :through => :relationships
- attr_reader :user_tokens
+ #validations
validates_length_of :name, :maximum => 15
+ #actions
after_create :create_new_relationship
def name_format
View
6 app/models/follow.rb
@@ -1,12 +1,14 @@
class Follow < ActiveRecord::Base
-
+ #call acts_as_follower gem
extend ActsAsFollower::FollowerLib
extend ActsAsFollower::FollowScopes
# NOTE: Follows belong to the "followable" interface, and also to followers
belongs_to :followable, :polymorphic => true
belongs_to :follower, :polymorphic => true
-
+
+
+ #call this method to block a user
def block!
self.update_attribute(:blocked, true)
end
View
13 app/models/group.rb
@@ -1,24 +1,25 @@
class Group < ActiveRecord::Base
resourcify
+
attr_accessible :active, :description, :name, :privacy_level, :user, :gcategory_id, :avatar
+
+ #call carrierwave uploader
+ mount_uploader :avatar, AvatarUploader
+
+ #relationships
belongs_to :gcategory
belongs_to :user
has_many :memberships, dependent: :destroy
has_many :activities, :foreign_key => :parent_id, dependent: :destroy
- mount_uploader :avatar, AvatarUploader
-
validates_presence_of :name, :description
-
+ #actions
after_create :create_new_membership
-
-
-
private
def create_new_membership
View
7 app/models/membership.rb
@@ -1,7 +1,10 @@
class Membership < ActiveRecord::Base
- attr_accessible :user_id, :group_id
+ #fields accessible
+ attr_accessible :user_id, :group_id,:blocked, :pending
+
+ #relationships
belongs_to :user
belongs_to :group
- attr_accessible :blocked, :pending
+
end
View
7 app/models/message.rb
@@ -1,13 +1,18 @@
class Message < ActiveRecord::Base
+
+ #fields accessible
attr_accessible :body, :sender_id, :subject, :user_tokens
+ #set attribute reader
+ attr_reader :user_tokens
+ #relationships
belongs_to :sender, :class_name => 'User'
has_many :recipients
has_many :users, :through => :recipients
- attr_reader :user_tokens
+ #create user tokens virtual attribute
def user_tokens=(ids)
self.user_ids = ids.split(",")
View
18 app/models/post.rb
@@ -7,7 +7,7 @@ class Post < ActiveRecord::Base
include Likeable
mount_uploader :attachment, AttachmentUploader
- #associations
+ #relationships
belongs_to :in_reply_to, :class_name => "Activity", :foreign_key => "reply_to_id"
belongs_to :user
@@ -19,22 +19,6 @@ class Post < ActiveRecord::Base
validates_presence_of :content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
end
View
12 app/views/activities/_index.html.erb
@@ -1,11 +1,11 @@
<% if @activities.count == 0 %>
-<div class="row-fluid activity-item">
-<div class="alert alert-error">
- No recent activity.
-</div>
-</div>
+ <div class="row-fluid activity-item">
+ <div class="alert alert-error">
+ No recent activity.
+ </div>
+ </div>
<% else %>
-<%= render :partial => @activities , :as => :activity %>
+ <%= render :partial => @activities , :as => :activity %>
<% end %>
View
23 app/views/activities/_likes.html.erb
@@ -1,15 +1,12 @@
- <% activity = Activity.find(like_object)%>
- <div id="activity_like_<%= activity.id %>" class="activity-like-menu">
-
- <a href="javascript:toggleDiv('expanded_<%=activity.id %>');" class= "icon-resize-full"> Expand </a>
-
- <%- if current_user.likes? activity.target -%>
- <%= unlike_link_for activity.target %>
+<% activity = Activity.find(like_object)%>
+ <div id="activity_like_<%= activity.id %>" class="activity-like-menu">
+ <a href="javascript:toggleDiv('expanded_<%=activity.id %>');" class= "icon-resize-full"> Expand </a>
+ <%- if current_user.likes? activity.target -%>
+ <%= unlike_link_for activity.target %>
<%- else -%>
- <%= like_link_for activity.target %>
+ <%= like_link_for activity.target %>
<%- end -%>
- <%= link_to new_post_path(:reply_to_id => activity.id), :remote => true do %>
- <i class="icon-comment"></i> Reply
- <% end %>
-
- </div>
+ <%= link_to new_post_path(:reply_to_id => activity.id), :remote => true do %>
+ <i class="icon-comment"></i> Reply
+ <% end %>
+ </div>
View
53 app/views/activities/_post.html.erb
@@ -1,42 +1,19 @@
<% unless activity.target.nil? %>
-
<div class="row-fluid activity-item">
-
- <div id="activity-sidebar" class="span2 activity-sidebar">
-
-
- <%= image_tag activity.user.profile.avatar.url(:thumb), :class => "avatar" %>
- <h4><%= link_to activity.user.username, activity.user %></h4>
- <i class="icon-time"></i> <%= time_ago_in_words(activity.created_at) %>
-
-
-
- </div>
- <div id="post-body" class="span8 activity-body">
- <div class="activity-content">
+ <div id="activity-sidebar" class="span2 activity-sidebar">
+ <%= image_tag activity.user.profile.avatar.url(:thumb), :class => "avatar" %>
+ <h4><%= link_to activity.user.username, activity.user %></h4>
+ <i class="icon-time"></i> <%= time_ago_in_words(activity.created_at) %>
+ </div>
+ <div id="post-body" class="span8 activity-body">
+ <div class="activity-content">
<p>
<%= link_to "Posted", activity.target %><%if activity.parent_id > 0%> to a group: <% end %>
<% if activity.target.reply_to_id %> in reply to: <% end %>
<%= (mention_linker(activity.target.content)).html_safe %> <% if activity.target.attachment? %> -Photo Attached <% end%>
</p>
- </div>
-
-
-
-
- <%= render "activities/likes", :like_object => activity %>
-
-
-
-
-
-
-
-
-
-
-
-
+ </div>
+ <%= render "activities/likes", :like_object => activity %>
<div id="expanded_<%= activity.id %>" class="expanded" Style="display:none;">
<div class="expanded-menu row-fluid">
<div class="expanded-like-count span2">
@@ -48,8 +25,7 @@
<div class="span2">
</div>
- <div class="span8">
-
+ <div class="span8">
<% activity.target.likes.each do |likeuser| %>
<%= image_tag likeuser.user.profile.avatar.url(:mini), :class => "avatar" %>
<% end %>
@@ -82,8 +58,7 @@
</div>
<% end %>
</div>
- </div>
-
+ </div>
</div>
<div class="span2 activity-logo" >
<div class="activity-logo visible-desktop">
@@ -92,11 +67,7 @@
</div>
</div>
<% else %>
-
<div class="content-removed">
Content Removed
</div>
-
-<% end %>
-
-
+<% end %>
View
14 app/views/circles/_form.html.erb
@@ -1,20 +1,12 @@
<%= simple_form_for @circle do |f| %>
-
-
<%= f.error_notification %>
-
-
-
- <div class="form-inputs">
+<div class="form-inputs">
<%= f.input :name %>
<%= f.input :user_tokens, :label => "Circle Members", :as => 'string', :input_html => { data: {load: @circle.users.collect {|user| {:id => user.id, :name => user.username } }}}, :class=> "x-large"%>
-
<%= f.input :description %>
- </div>
+</div>
-<div class="form-actions">
-
+<div class="form-actions">
<%= f.button :submit, :class=>"btn btn-primary"%>
-
</div>
<% end %>
View
62 app/views/circles/index.html.erb
@@ -1,39 +1,35 @@
<% content_for :sidebar do %>
-<div id="circle_sidebar">
-<%= render "circles/sidebar" %>
-</div>
-<% end %>
-
-
-<div class="stats-top row-fluid">
- <div class="span10">
+ <div id="circle_sidebar">
+ <%= render "circles/sidebar" %>
</div>
- <div class="span2">
- <a class="btn btn-primary" data-toggle="modal" href="#circle-modal">New Circle <i class="icon-upload"></i></a>
+<% end %>
+ <div class="stats-top row-fluid">
+ <div class="span10">
+ </div>
+ <div class="span2">
+ <p>
+ <a class="btn btn-primary" data-toggle="modal" href="#circle-modal">New Circle <i class="icon-upload"></i></a>
+ </p>
+ </div>
</div>
-
-</div>
-
-<div class="tab-content">
-
+<div class="tab-content">
<div class="tab-pane active inbox" id="following-tab">
<div class="circle-header">
<h2>People I follow</h2>
</div>
<% current_user.follows.each do |follow| %>
<div class="user-card row-fluid">
- <div class="user-card-avatar span2">
- <%= image_tag follow.followable.profile.avatar.url(:thumb) %>
- </div>
- <div class="user-card-main span7">
+ <div class="user-card-avatar span2">
+ <%= image_tag follow.followable.profile.avatar.url(:thumb) %>
+ </div>
+ <div class="user-card-main span7">
<%= follow.followable.username %>
- </div>
- <div class="user-card-control span3">
+ </div>
+ <div class="user-card-control span3">
<%= render :partial => "follows/follow_user", :locals => {:user => follow.followable } %>
- </div>
- </div>
+ </div>
+ </div>
<% end %>
-
</div>
<div class="tab-pane inbox" id="followers-tab">
<div class="circle-header">
@@ -87,8 +83,6 @@
</div>
<% end %>
</div>
-
-
<div class="modal hide" id="circle-modal">
<%= simple_form_for @circle, :remote => true do |f| %>
<div class="modal-header">
@@ -96,21 +90,17 @@
<%= f.error_notification %>
</div>
<div class="modal-body">
-
<div class="form-inputs">
<%= f.input :name %>
<%= f.input :user_tokens, :label => "Circle Members", :as => 'string', :input_html => { data: {load: @circle.users.collect {|user| {:id => user.id, :name => user.username } }}}, :class=> "x-large"%>
-
- <%= f.input :description %>
- </div>
-</div>
-<div class="modal-footer">
-
+ <%= f.input :description %>
+ </div>
+ </div>
+ <div class="modal-footer">
<%= f.button :submit %>
-
-</div>
-<% end %>
</div>
+ <% end %>
+ </div>
View
8 app/views/devise/registrations/edit.html.erb
@@ -5,12 +5,12 @@
<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= f.error_notification %>
<ul class="nav nav-tabs" id="myTab">
- <li class="active"><a href="#account"data-toggle="tab">Account</a></li>
+ <li class="active"><a href="#account" data-toggle="tab">Account</a></li>
- <li><a href="#wordpass" data-toggle="tab">Password</a></li>
- <li><a href="#settings" data-toggle="tab">Settings</a></li>
- <li><a href="#cancel_account" data-toggle="tab">Cancel Account</a></li>
+ <li><a href="#wordpass" data-no-turbolink="true" data-toggle="tab">Password</a></li>
+ <li><a href="#settings" data-no-turbolink="true" data-toggle="tab">Settings</a></li>
+ <li><a href="#cancel_account" data-no-turbolink="true" data-toggle="tab">Cancel Account</a></li>
</ul>
<div class="tab-content">
View
2  app/views/follows/_follow.html.erb
@@ -1 +1 @@
- <%= button_to("Follow #{user.username}", user_follows_path(user.to_param), :remote => true) %>
+ <%= button_to("Follow #{user.username}", user_follows_path(user.to_param), :"data-no-turbolink"=>true, :remote => true) %>
View
4 app/views/follows/_follow_user.html.erb
@@ -1,7 +1,7 @@
<% unless user == current_user %>
<% if current_user.following?(user) %>
<div class="btn-group">
- <%= link_to("Following", user_follow_path(user.to_param, current_user.get_follow(user).id), :method => :delete, :remote => true, :class => "btn btn-mini btn-primary") %>
+ <%= link_to("Following", user_follow_path(user.to_param, current_user.get_follow(user).id), :"data-no-turbolink"=>true, :method => :delete, :remote => true, :class => "btn btn-mini btn-primary") %>
<a data-toggle="modal" class="btn btn-mini btn-primary" href="#dm-modal"><i class="icon-envelope"></i></a>
<a class="btn btn-mini btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></a>
<ul class="dropdown-menu">
@@ -14,7 +14,7 @@
</div>
<% else %>
<div class="btn-group">
- <%= link_to("Follow", user_follows_path(user.to_param), :method => :post,:remote => true, :class => "btn btn-mini btn-primary") %>
+ <%= link_to("Follow", user_follows_path(user.to_param), :"data-no-turbolink"=>true, :method => :post,:remote => true, :class => "btn btn-mini btn-primary") %>
<a data-toggle="modal" class="btn btn-mini btn-primary" href="#dm-modal"><i class="icon-envelope"></i></a>
<a class="btn btn-mini btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></a>
<ul class="dropdown-menu">
View
2  app/views/follows/_unfollow.html.erb
@@ -1 +1 @@
- <%= button_to("Un-Follow #{user.username}", user_follow_path(user.to_param, current_user.get_follow(user).id), :method => :delete, :remote => true) %>
+ <%= button_to("Un-Follow #{user.username}", user_follow_path(user.to_param, current_user.get_follow(user).id), :"data-no-turbolink"=>true, :method => :delete, :remote => true) %>
View
15 app/views/users/confirmations/new.html.erb
@@ -1,15 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= f.error_notification %>
-
- <div class="form-inputs">
- <%= f.input :email, :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Resend confirmation instructions" %>
- </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
5 app/views/users/mailer/confirmation_instructions.html.erb
@@ -1,5 +0,0 @@
-<p>Welcome <%= @resource.email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
View
8 app/views/users/mailer/reset_password_instructions.html.erb
@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
-
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>
View
7 app/views/users/mailer/unlock_instructions.html.erb
@@ -1,7 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
-
-<p>Click the link below to unlock your account:</p>
-
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
View
19 app/views/users/passwords/edit.html.erb
@@ -1,19 +0,0 @@
-<h2>Change your password</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= f.error_notification %>
-
- <%= f.input :reset_password_token, :as => :hidden %>
- <%= f.full_error :reset_password_token %>
-
- <div class="form-inputs">
- <%= f.input :password, :label => "New password", :required => true %>
- <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Change my password" %>
- </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
15 app/views/users/passwords/new.html.erb
@@ -1,15 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= f.error_notification %>
-
- <div class="form-inputs">
- <%= f.input :email, :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Send me reset password instructions" %>
- </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
22 app/views/users/registrations/edit.html.erb
@@ -1,22 +0,0 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= f.error_notification %>
-
- <div class="form-inputs">
- <%= f.input :email, :required => true, :autofocus => true %>
- <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %>
- <%= f.input :password_confirmation, :required => false %>
- <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Update" %>
- </div>
-<% end %>
-
-<h3>Cancel my account</h3>
-
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
-
-<%= link_to "Back", :back %>
View
19 app/views/users/registrations/new.html.erb
@@ -1,19 +0,0 @@
-
-
-<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class=> "well"}) do |f| %>
- <%= f.error_notification %>
- <fieldset>
- <legend><h2>New Account</h2></legend>
- <div class="form-inputs">
- <%= f.input :email, :required => true, :autofocus => true %>
- <%= f.input :password, :required => true %>
- <%= f.input :password_confirmation, :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Sign up" %>
- </div>
- </fieldset>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
15 app/views/users/sessions/new.html.erb
@@ -1,15 +0,0 @@
-<h2>Sign in</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class=>"well"}) do |f| %>
- <div class="form-inputs">
- <%= f.input :email, :required => false, :autofocus => true %>
- <%= f.input :password, :required => false %>
- <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Sign in" %>
- </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
25 app/views/users/shared/_links.erb
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
- <%= link_to "Sign up", new_registration_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
- <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
- <%- resource_class.omniauth_providers.each do |provider| %>
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
- <% end -%>
-<% end -%>
View
4 app/views/users/show.html.erb
@@ -88,8 +88,8 @@
</div>
<div class="user-controls row-fluid">
<ul class="nav nav-tabs">
- <li class="active"><a href="#activity-feed" data-toggle="tab">Feed</a></li>
- <li><a href="#dash" data-toggle="tab">Dashboard</a></li>
+ <li class="active"><a href="#activity-feed" data-no-turbolink = "true" data-toggle="tab">Feed</a></li>
+ <li><a href="#dash" data-no-turbolink = "true" data-toggle="tab">Dashboard</a></li>
</ul>
</div>
View
15 app/views/users/unlocks/new.html.erb
@@ -1,15 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= f.error_notification %>
-
- <div class="form-inputs">
- <%= f.input :email, :required => true %>
- </div>
-
- <div class="form-actions">
- <%= f.button :submit, "Resend unlock instructions" %>
- </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
View
23 vendor/bundle/ruby/1.9.1/bin/autospec
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rspec-core' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rspec-core', version
-load Gem.bin_path('rspec-core', 'autospec', version)
View
23 vendor/bundle/ruby/1.9.1/bin/cucumber
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'cucumber' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'cucumber', version
-load Gem.bin_path('cucumber', 'cucumber', version)
View
23 vendor/bundle/ruby/1.9.1/bin/erubis
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'erubis' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'erubis', version
-load Gem.bin_path('erubis', 'erubis', version)
View
23 vendor/bundle/ruby/1.9.1/bin/heroku
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'heroku' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'heroku', version
-load Gem.bin_path('heroku', 'heroku', version)
View
25 vendor/bundle/ruby/1.9.1/bin/htmldiff
@@ -1,25 +0,0 @@
-#!/bin/sh
-'exec' "ruby" '-x' "$0" "$@"
-#!/home/jody/.rvm/rubies/ruby-1.9.3-p194/bin/ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'diff-lcs' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'diff-lcs', version
-load Gem.bin_path('diff-lcs', 'htmldiff', version)
View
23 vendor/bundle/ruby/1.9.1/bin/launchy
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'launchy' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'launchy', version
-load Gem.bin_path('launchy', 'launchy', version)
View
25 vendor/bundle/ruby/1.9.1/bin/ldiff
@@ -1,25 +0,0 @@
-#!/bin/sh
-'exec' "ruby" '-x' "$0" "$@"
-#!/home/jody/.rvm/rubies/ruby-1.9.3-p194/bin/ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'diff-lcs' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'diff-lcs', version
-load Gem.bin_path('diff-lcs', 'ldiff', version)
View
23 vendor/bundle/ruby/1.9.1/bin/lessc
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'less' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'less', version
-load Gem.bin_path('less', 'lessc', version)
View
23 vendor/bundle/ruby/1.9.1/bin/nokogiri
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'nokogiri' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'nokogiri', version
-load Gem.bin_path('nokogiri', 'nokogiri', version)
View
23 vendor/bundle/ruby/1.9.1/bin/oauth
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'oauth' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'oauth', version
-load Gem.bin_path('oauth', 'oauth', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rackup
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rack' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rack', version
-load Gem.bin_path('rack', 'rackup', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rails
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'railties' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'railties', version
-load Gem.bin_path('railties', 'rails', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rake
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rake', version
-load Gem.bin_path('rake', 'rake', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rake2thor
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'thor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'thor', version
-load Gem.bin_path('thor', 'rake2thor', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rdoc
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rdoc' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rdoc', version
-load Gem.bin_path('rdoc', 'rdoc', version)
View
23 vendor/bundle/ruby/1.9.1/bin/restclient
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rest-client' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rest-client', version
-load Gem.bin_path('rest-client', 'restclient', version)
View
23 vendor/bundle/ruby/1.9.1/bin/ri
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rdoc' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rdoc', version
-load Gem.bin_path('rdoc', 'ri', version)
View
23 vendor/bundle/ruby/1.9.1/bin/rspec
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'rspec-core' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'rspec-core', version
-load Gem.bin_path('rspec-core', 'rspec', version)
View
23 vendor/bundle/ruby/1.9.1/bin/therubyracer
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'therubyracer' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'therubyracer', version
-load Gem.bin_path('therubyracer', 'therubyracer', version)
View
23 vendor/bundle/ruby/1.9.1/bin/thin
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'thin' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'thin', version
-load Gem.bin_path('thin', 'thin', version)
View
23 vendor/bundle/ruby/1.9.1/bin/thor
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'thor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'thor', version
-load Gem.bin_path('thor', 'thor', version)
View
23 vendor/bundle/ruby/1.9.1/bin/tilt
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'tilt' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'tilt', version
-load Gem.bin_path('tilt', 'tilt', version)
View
23 vendor/bundle/ruby/1.9.1/bin/tt
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'treetop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\A_(.*)_\z/
- version = $1
- ARGV.shift
- end
-end
-
-gem 'treetop', version
-load Gem.bin_path('treetop', 'tt', version)
1  vendor/bundle/ruby/1.9.1/bundler/gems/client_side_validations-192002036565
@@ -1 +0,0 @@
-Subproject commit 1920020365657d4819c2c5a9c2c01af67fbf6bbd
1  vendor/bundle/ruby/1.9.1/bundler/gems/rails3-jquery-autocomplete-05c506848a49
@@ -1 +0,0 @@
-Subproject commit 05c506848a4993a9cf92217a34d163b96713958b
View
BIN  vendor/bundle/ruby/1.9.1/cache/actionmailer-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/actionpack-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/activemodel-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/activerecord-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/activeresource-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/activesupport-3.2.8.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/acts_as_follower-0.1.1.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/addressable-2.3.2.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/arel-3.0.2.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/bcrypt-ruby-3.0.1.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/best_in_place-1.1.2.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/builder-3.0.3.gem
Binary file not shown
View
BIN  vendor/bundle/ruby/1.9.1/cache/bullet-4.1.6.gem
Binary file not shown
View
1  ...1/cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/HEAD
@@ -1 +0,0 @@
-ref: refs/heads/3-1-stable
View
6 ...cache/bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/config
@@ -1,6 +0,0 @@
-[core]
- repositoryformatversion = 0
- filemode = true
- bare = true
-[remote "origin"]
- url = git://github.com/bcardarella/client_side_validations.git
View
1  .../bundler/git/client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/description
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
View
15 ...ent_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/applypatch-msg.sample
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit. The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/commit-msg" &&
- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
-:
View
24 .../client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/commit-msg.sample
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message. The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit. The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- echo >&2 Duplicate Signed-off-by lines.
- exit 1
-}
View
8 ...client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/post-update.sample
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info
View
14 ...ent_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-applypatch.sample
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
-:
View
50 .../client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-commit.sample
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments. The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
- against=HEAD
-else
- # Initial commit: diff against an empty tree object
- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-# If you want to allow non-ascii filenames set this variable to true.
-allownonascii=$(git config hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ascii filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
- # Note that the use of brackets around a tr range is ok here, (it's
- # even required, for portability to Solaris 10's /usr/bin/tr), since
- # the square bracket bytes happen to fall in the designated range.
- test $(git diff --cached --name-only --diff-filter=A -z $against |
- LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
- echo "Error: Attempt to add a non-ascii file name."
- echo
- echo "This can cause problems if you want to work"
- echo "with people on other platforms."
- echo
- echo "To be portable it is advisable to rename the file ..."
- echo
- echo "If you know what you are doing you can disable this"
- echo "check using:"
- echo
- echo " git config hooks.allownonascii true"
- echo
- exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --
View
169 .../client_side_validations-1f04c5ec97583337510881f8ffe18e720a45ff58/hooks/pre-rebase.sample
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
- topic="refs/heads/$2"
-else
- topic=`git symbolic-ref HEAD` ||
- exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
- ;;
-*)
- exit 0 ;# we do not interrupt others.
- ;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master. Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
- echo >&2 "No such branch $topic"
- exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
- echo >&2 "$topic is fully merged to master; better remove it."
- exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next? If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
- not_in_topic=`git rev-list "^$topic" master`
- if test -z "$not_in_topic"
- then
- echo >&2 "$topic is already up-to-date with master"
- exit 1 ;# we could allow it, but there is no point.
- else
- exit 0
- fi
-else
- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
- /usr/bin/perl -e '
- my $topic = $ARGV[0];
- my $msg = "* $topic has commits already merged to public branch:\n";
- my (%not_in_next) = map {
- /^([0-9a-f]+) /;
- ($1 => 1);
- } split(/\n/, $ARGV[1]);
- for my $elem (map {
- /^([0-9a-f]+) (.*)$/;
- [$1 => $2];
- } split(/\n/, $ARGV[2])) {
- if (!exists $not_in_next{$elem->[0]}) {
- if ($msg) {
- print STDERR $msg;
- und