Merge branch 'feature/include_rubocop' into dev

pull/2562/merge
Alex Coles 10 years ago
commit 2f23697c05
  1. 1
      Gemfile
  2. 14
      Gemfile.lock

@ -174,6 +174,7 @@ group :development do
gem 'thin' gem 'thin'
gem 'faker' gem 'faker'
gem 'quiet_assets' gem 'quiet_assets'
gem 'rubocop', '~> 0.28'
end end
group :development, :test do group :development, :test do

@ -85,6 +85,9 @@ GEM
activerecord (>= 3.0) activerecord (>= 3.0)
addressable (2.3.4) addressable (2.3.4)
arel (3.0.3) arel (3.0.3)
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
autoprefixer-rails (5.1.5) autoprefixer-rails (5.1.5)
execjs execjs
json json
@ -266,8 +269,11 @@ GEM
omniauth (1.2.1) omniauth (1.2.1)
hashie (>= 1.2, < 3) hashie (>= 1.2, < 3)
rack (~> 1.0) rack (~> 1.0)
parser (2.2.0.2)
ast (>= 1.1, < 3.0)
pg (0.17.1) pg (0.17.1)
polyglot (0.3.5) polyglot (0.3.5)
powerpack (0.0.9)
prototype-rails (3.2.1) prototype-rails (3.2.1)
rails (~> 3.2) rails (~> 3.2)
pry (0.9.12.6) pry (0.9.12.6)
@ -328,6 +334,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rainbow (2.0.0)
raindrops (0.13.0) raindrops (0.13.0)
rake (10.4.2) rake (10.4.2)
rb-readline (0.5.1) rb-readline (0.5.1)
@ -369,6 +376,12 @@ GEM
rspec-core (~> 2.99.0) rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0) rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0) rspec-mocks (~> 2.99.0)
rubocop (0.28.0)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-duration (3.2.0) ruby-duration (3.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
i18n i18n
@ -507,6 +520,7 @@ DEPENDENCIES
rspec-activemodel-mocks rspec-activemodel-mocks
rspec-example_disabler! rspec-example_disabler!
rspec-rails (~> 2.99.0) rspec-rails (~> 2.99.0)
rubocop (~> 0.28)
ruby-duration (~> 3.2.0) ruby-duration (~> 3.2.0)
ruby-prof ruby-prof
ruby-progressbar ruby-progressbar

Loading…
Cancel
Save