Cliff Braton cb9af6c9dc Merge remote-tracking branch 'origin/master' into feature/rspec3-updates ... # Conflicts: # .travis.yml # Gemfile # Guardfile # draper.gemspec # lib/generators/rspec/templates/decorator_spec.rb # spec/draper/collection_decorator_spec.rb # spec/draper/decoratable_spec.rb # spec/draper/decorated_association_spec.rb # spec/draper/decorates_assigned_spec.rb # spec/draper/decorator_spec.rb # spec/draper/factory_spec.rb # spec/draper/finders_spec.rb # spec/draper/view_context/build_strategy_spec.rb # spec/draper/view_context_spec.rb # spec/dummy/fast_spec/post_decorator_spec.rb # spec/dummy/spec/models/post_spec.rb # spec/generators/controller/controller_generator_spec.rb # spec/generators/decorator/decorator_generator_spec.rb # spec/support/shared_examples/view_helpers.rb		2019-03-20 12:59:34 -05:00
..
application_spec.rb	Railsify dummy app (rails v5.*) (#810)	2017-06-20 08:56:53 -05:00
mongoid_post_spec.rb	Updated all specs to RSpec 3.0 syntax	2015-08-27 01:08:59 -06:00
post_spec.rb	Merge remote-tracking branch 'origin/master' into feature/rspec3-updates	2019-03-20 12:59:34 -05:00