Changeset [80d61bc076c4e592b8b358228941afb1cefd076a] by Jason Lee
Revision 80d61bc076c4e592b8b358228941afb1cefd076a,
committed by Jason Lee
· January 23rd, 2014 @ 02:34 PM
Merge remote-tracking branch 'paolodona/master'
Conflicts:
resources_controller.gemspec
https://github.com/ianwhite/resources_controller/commit/80d61bc076c...
69 changed files
-
A
".travis.yml" -
A
CHANGELOG -
A
Gemfile.lock.development -
A
MIT-LICENSE -
A
lib/rc_rails.rb -
A
lib/resources_controller/actions.rb -
A
lib/resources_controller/active_record/saved.rb -
A
lib/resources_controller/helper.rb -
A
lib/resources_controller/include_actions.rb -
A
lib/resources_controller/named_route_helper.rb -
A
lib/resources_controller/railtie.rb -
A
lib/resources_controller/request_path_introspection.rb -
A
lib/resources_controller/resource_methods.rb -
A
lib/resources_controller/singleton_actions.rb -
A
lib/resources_controller/specification.rb -
A
lib/resources_controller/version.rb -
R
Gemfile.lock -
R
History.txt -
R
License.txt -
R
lib/ardes/active_record/saved.rb -
R
lib/ardes/resources_controller.rb -
R
lib/ardes/resources_controller/actions.rb -
R
lib/ardes/resources_controller/helper.rb -
R
lib/ardes/resources_controller/include_actions.rb -
R
lib/ardes/resources_controller/named_route_helper.rb -
R
lib/ardes/resources_controller/request_path_introspection.rb -
R
lib/ardes/resources_controller/resource_methods.rb -
R
lib/ardes/resources_controller/singleton_actions.rb -
R
lib/ardes/resources_controller/specification.rb -
M
".gitignore" -
M
Gemfile -
M
README.rdoc -
M
Rakefile -
M
Todo.txt -
M
lib/resources_controller.rb -
M
resources_controller.gemspec -
M
spec/app.rb -
M
spec/app/database.yml -
M
spec/controllers/accounts_controller_spec.rb -
M
spec/controllers/addresses_controller_spec.rb -
M
spec/controllers/admin_forums_controller_spec.rb -
M
spec/controllers/comments_controller_spec.rb -
M
spec/controllers/comments_controller_with_models_spec.rb -
M
spec/controllers/forum_posts_controller_spec.rb -
M
spec/controllers/forums_controller_spec.rb -
M
spec/controllers/infos_controller_spec.rb -
M
spec/controllers/interests_controller_via_forum_spec.rb -
M
spec/controllers/interests_controller_via_user_spec.rb -
M
spec/controllers/owners_controller_spec.rb -
M
spec/controllers/resource_saved_spec.rb -
M
spec/controllers/resource_service_in_forums_controller_spec.rb -
M
spec/controllers/resource_service_in_infos_controller_spec.rb -
M
spec/controllers/resource_service_in_interests_controller_via_forum_spec.rb -
M
spec/controllers/tags_controller_spec.rb -
M
spec/controllers/tags_controller_via_account_info_spec.rb -
M
spec/controllers/tags_controller_via_forum_post_comment_spec.rb -
M
spec/controllers/tags_controller_via_forum_post_spec.rb -
M
spec/controllers/tags_controller_via_forum_spec.rb -
M
spec/controllers/tags_controller_via_user_address_spec.rb -
M
spec/controllers/users_controller_spec.rb -
M
spec/lib/action_view_helper_spec.rb -
M
spec/lib/bug_0001_spec.rb -
M
spec/lib/include_actions_spec.rb -
M
spec/lib/load_enclosing_resources_spec.rb -
M
spec/lib/request_path_introspection_spec.rb -
M
spec/lib/resource_methods_spec.rb -
M
spec/lib/resources_controller_spec.rb -
M
spec/models/comment_saved_spec.rb -
M
spec/rspec_generator_task.rb