Commit 0510b77

committed

Merge remote-tracking branch 'upstream/develop' into develop

2 parents 5b024f9 + e2b250b commit 0510b77Copy full SHA for 0510b77

10 files changed

+238

-93

lines changed

.gitignore
.rubocop_todo.yml
.travis.yml
Gemfile
annotate.gemspec
circle.yml
lib/annotate
- annotate_models.rb
spec
- annotate
  - annotate_models_spec.rb
  - annotate_routes_spec.rb
- spec_helper.rb

10 files changed

+238

-93

lines changed

`‎.gitignore`

-Original file line number
+Diff line change
 /spec/integration/*/db/test.*
 /spec/integration/*/log/*
 /spec/integration/*/tmp/*
 +.byebug_history

Comments

(0)