rubocop passes spec/models/user_spec.rb
rubocop down 19 to 3 for app/controllers/users_controller.rb
rubocop and more
Merge branch 'master' into melspecs
rubocop down 26 to 5 for app/controllers/search_controller.rb
rubocop down from 19 to 1 for app/controllers/application_controller.rb
rubocop down 16 to 2 for app/controllers/categories_controller.rb
rubocop passes all config/initializers/carrierwave.rb
rubocop down 15 to 4 for app/controllers/sessions_controller.rb
rubocop down 11 to 2 for app/controllers/reviews_controller.rb
rubocop down 8 to 1 for app/models/purchase_info.rb
rubocop down 7 to 1 for app/controllers/category_products_controller.rb
rubocop down 3 to 1 for app/models/user.rb
rubocop down 55 to 8 for app/controllers/orders_controller.rb
rubocop passes spec/models/order_spec.rb
rubocop passes spec/models/order_product_spec.rb
rubocop and refactored users
fixed conflicts with master
Merge pull request #3 from mkmizuta/melspecs

Melspecs