merge upstream/master and resolve conflicts from https://github.com/openstreetmap...
[rails.git] / test / controllers / diary_entry_controller_test.rb
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
2016-10-12 Mikel Maronlast minor fixes
2016-10-10 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1312'
2016-10-07 Mikel Maronclean up comments
2016-10-07 Mikel Maronfix rubocop warnings
2016-10-07 Mikel Maronfix rubocop warnings
2016-10-07 Mikel Marontests passing
2016-10-05 Andy AllanReplace friends fixture with a factory
2016-10-04 Mikel Maronnot api endpoints, moved to button, fixed notifier...
2016-10-03 Mikel MaronWIP diary comment subscriptions
2016-09-15 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1285'
2016-09-15 Andy AllanAdd additional list items to ensure they are not selected
2016-09-14 Andy AllanRemove diary_entry and diary_comment fixtures, and...
2016-09-08 Andy AllanRefactor tests to use factories instead of fixtures
2016-08-15 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1004'
2016-03-20 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2016-03-14 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2015-08-27 Tom HughesUpdate test for changes in #903
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-03-07 Tom HughesAdd a few more tests
2015-03-04 Tom HughesTests!
2015-03-02 Tom HughesLoad friends fixtures for diary entry tests
2015-03-02 Tom HughesYet more tests...
2015-02-22 Tom HughesLoad user_roles fixtures so we know who is an administrator
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
2015-01-26 Richard FairhurstMerge pull request #28 from zerebubuth/routing-ui-tweaks-2
2015-01-26 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2015-01-17 Tom HughesMerge branch 'rails42'
2015-01-11 Tom HughesUpdated for changes in rails HTML testing
2015-01-10 Tom HughesFix invalid CSS selectors
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