diff options
| author | danielgrippi <danielgrippi@gmail.com> | 2011-05-13 02:49:51 +0400 |
|---|---|---|
| committer | danielgrippi <danielgrippi@gmail.com> | 2011-05-13 02:49:51 +0400 |
| commit | 60a60733dfc44015147fe9f9bc755a4a45f522aa (patch) | |
| tree | 4a7d93ef6112c093973a33558235553e1a9349ec /app/controllers/aspects_controller.rb | |
| parent | 3c82af49bfd38c9fc9d5c10e86d643833a7f3385 (diff) | |
| parent | 71e77d59b37270cae0993c7bc78c6f2f045ad24e (diff) | |
Merge branch 'master' into follow
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
Diffstat (limited to 'app/controllers/aspects_controller.rb')
| -rw-r--r-- | app/controllers/aspects_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index c26e20c4c..c6282b1ff 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -3,7 +3,6 @@ # the COPYRIGHT file. class AspectsController < ApplicationController - helper :comments before_filter :authenticate_user! before_filter :save_sort_order, :only => :index before_filter :ensure_page, :only => :index |