]> git.openstreetmap.org Git - rails.git/history - app/models/user.rb
Merge remote-tracking branch 'upstream/pull/2452'
[rails.git] / app / models / user.rb
2019-12-18 Tom HughesMerge remote-tracking branch 'upstream/pull/2452'
2019-12-11 Tom HughesMerge remote-tracking branch 'upstream/pull/2461'
2019-12-11 Andy AllanRemove ignoring of nearby column
2019-12-04 Andy AllanMerge pull request #2427 from mmd-osm/patch/remove_expa...
2019-11-27 Tom HughesMerge remote-tracking branch 'upstream/pull/2447'
2019-11-27 Andy AllanCreate an ApplicationRecord for models to inherit from
2019-11-14 Tom HughesMerge remote-tracking branch 'upstream/pull/2433'
2019-11-14 Tom HughesMerge remote-tracking branch 'upstream/pull/2432'
2019-11-13 Andy AllanIgnore the users.nearby column
2019-08-31 Stefan BaeblerMerge branch 'master' into tag-colour-preview-rebase
2019-08-28 Tom HughesMerge remote-tracking branch 'upstream/pull/1926'
2019-08-28 Andy AllanMerge pull request #2266 from systemed/patch-2
2019-07-17 Tom HughesDrop old user image columns
2019-07-17 Tom HughesMerge remote-tracking branch 'upstream/pull/2320'
2019-07-17 Andy AllanUpdate annotations after 91a37235ac748df7dc241b215790d6...
2019-07-16 Tom HughesRemove support for old style user images
2019-07-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2313'
2019-07-16 Tom HughesDefer deletion of avatars to a background job
2019-07-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2296'
2019-07-09 Tom HughesMove user images to Active Storage with paperclip as...
2019-06-27 mmdMerge branch 'master' into patch/view_migration
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2207'
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2271'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2267'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2270'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2269'
2019-06-19 Andy AllanPass the models, not the ids, when dealing with friendships
2019-06-19 Andy AllanRename user.friend_users to user.friends
2019-06-19 Andy AllanRename Friend model to Friendship
2019-06-18 Tom HughesMerge remote-tracking branch 'upstream/pull/2226'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2228'
2019-06-10 Tom HughesMerge remote-tracking branch 'upstream/pull/2204'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2225'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2237'
2019-05-29 Tom HughesMerge remote-tracking branch 'upstream/pull/2236'
2019-05-29 Andy AllanUpdate annotations to correctly show bigint types
2019-05-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2028'
2019-05-13 Simon PooleAdd links to the ToU and include them in signup
2019-03-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2175'
2019-03-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2182'
2019-03-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2177'
2019-03-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2164'
2019-03-13 Andy AllanMove all settings to settings.yml
2019-03-08 Tom HughesPrevent leading and trailing whitespace on email addresses
2019-03-08 Tom HughesStrip leading and trailing whitespace for email authent...
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2018-11-05 Tom HughesMerge remote-tracking branch 'upstream/pull/2044'
2018-11-05 Tom HughesMerge character validators
2018-11-05 Tom HughesMerge leading and trailing whitespace validators
2018-11-05 J GuthrieChanged User model to not allow nil display_name (w...
2018-11-05 J GuthrieCreate invalid_char validators and apply to models
2018-11-05 J GuthrieAdded more non-ascii chars to validation (matching...
2018-11-05 J GuthrieFix rubucop errors
2018-11-05 J GuthrieMake invalid char list more explicit (between ascii...
2018-11-05 J GuthrieAdded trailing/leading whitespace errors to locale
2018-11-05 J GuthrieSpecifiy invalid chars in username error message
2018-10-10 Andy AllanMerge branch 'authz' of https://github.com/rubyforgood...
2018-06-18 Tom HughesUpdate to rails 5.2.0
2018-06-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1576'
2018-06-10 Tom HughesMerge branch 'master' into next
2018-05-27 J GuthrieChange language immediately after updating settings
2018-04-11 Andy AllanMerge branch 'master' into moderation
2018-03-26 Tom HughesFix new rubocop warnings
2018-03-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1788'
2018-03-21 Andy AllanUse user_path links. Fixes #1785
2018-03-14 Andy AllanRemove nonsense has_one relationship
2018-03-09 Andy AllanMerge branch 'pull/1765'
2018-03-04 Tom HughesValidate user location is sensible
2018-03-04 Tom HughesUse home_tile to find nearby users
2018-03-04 Tom HughesAdd an indexed home_tile column to the user table
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-27 Tom HughesMerge remote-tracking branch 'upstream/pull/1769'
2018-02-26 Tom HughesExclude hidden diary entries and comments from spam...
2018-02-04 Tom HughesMerge remote-tracking branch 'upstream/pull/1704'
2018-02-03 Tom HughesMerge remote-tracking branch 'upstream/pull/1693'
2018-01-22 Tom HughesFix new rubocop warnings
2018-01-21 Andy AllanMerge branch 'master' into moderation
2017-11-29 Andy AllanMerge branch 'master' into moderation
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-10-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1652'
2017-10-24 Tom HughesMerge remote-tracking branch 'upstream/pull/1659'
2017-10-22 Andy AllanAdd annotate gem and associated rake task. Annotate...
2017-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-01 Tom HughesFix rubocop warnings
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1347...
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1401'
2017-02-05 Tom HughesUpdate rubocop
2016-12-18 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1367'
2016-11-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1350'
2016-10-31 Tom HughesFix rubocop warnings
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-20 Tom HughesFix rubocop warnings
2016-10-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1309'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
next