aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/dependencies/conflict.rb
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-021-1/+0
* Enforce frozen string in RubocopKir Shatrov2017-07-011-0/+1
* normalizes indentation and whitespace across the projectXavier Noria2016-08-061-1/+1
* New dependencies implementationNicholas Seckar2006-08-081-0/+1