Update rubocop to version 0.21.0

This commit is contained in:
Erik Michaels-Ober 2014-04-24 05:45:58 -05:00
parent 384f00066d
commit b229a83783
4 changed files with 8 additions and 7 deletions

View File

@ -3,6 +3,7 @@ AllCops:
- 'Gemfile' - 'Gemfile'
- 'Rakefile' - 'Rakefile'
Exclude: Exclude:
- 'bin/*'
- 'db/schema.rb' - 'db/schema.rb'
# Avoid long parameter lists # Avoid long parameter lists

View File

@ -145,9 +145,9 @@ GEM
remotipart (1.2.1) remotipart (1.2.1)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rubocop (0.20.1) rubocop (0.21.0)
json (>= 1.7.7, < 2) json (>= 1.7.7, < 2)
parser (~> 2.1.7) parser (~> 2.1.9)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)

View File

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
Rails.application.config.action_dispatch.cookies_serializer = :json Rails.application.config.action_dispatch.cookies_serializer = :json

View File

@ -6,18 +6,18 @@ class AddDeviseToUsers < ActiveRecord::Migration
t.string :encrypted_password, null: false, default: '' t.string :encrypted_password, null: false, default: ''
## Recoverable ## Recoverable
t.string :reset_password_token t.string :reset_password_token
t.datetime :reset_password_sent_at t.datetime :reset_password_sent_at
## Rememberable ## Rememberable
t.datetime :remember_created_at t.datetime :remember_created_at
## Trackable ## Trackable
t.integer :sign_in_count, default: 0, null: false t.integer :sign_in_count, default: 0, null: false
t.datetime :current_sign_in_at t.datetime :current_sign_in_at
t.datetime :last_sign_in_at t.datetime :last_sign_in_at
t.string :current_sign_in_ip t.string :current_sign_in_ip
t.string :last_sign_in_ip t.string :last_sign_in_ip
## Confirmable ## Confirmable
# t.string :confirmation_token # t.string :confirmation_token