Merge remote-tracking branch 'upstream/pull/2167'
[rails.git] / test / models / friend_test.rb
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2017-11-22 Andy AllanMerge branch 'pull/843' into titles
2017-11-22 Andy AllanMerge branch 'p' of https://github.com/jfirebaugh/opens...
2017-11-15 Andy AllanMerge branch 'wheres_this' of https://github.com/pnorma...
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-01 Andy AllanRemove the api_fixtures helper
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
2016-10-10 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1312'
2016-10-05 Andy AllanReplace friends fixture with a factory
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-02-20 Tom HughesStandardise on double quoted strings
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2015-02-20 Tom HughesCleanup trailing whitespace
2014-03-08 Richard FairhurstMerge pull request #14 from tomhughes/routing
2014-03-08 Tom HughesMerge remote-tracking branch 'origin/master' into routing
2014-03-08 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2014-02-26 Tom HughesReorganise tests to match modern rails test layout