]> git.openstreetmap.org Git - rails.git/history - app/controllers/friendships_controller.rb
Merge remote-tracking branch 'upstream/pull/5268'
[rails.git] / app / controllers / friendships_controller.rb
2024-10-16 Andy AllanMerge pull request #4919 from rkoeze/rkoeze/add-github...
2024-09-19 Anton KhorevMerge branch 'pull/5117'
2024-09-13 Tom HughesMerge remote-tracking branch 'upstream/pull/5178'
2024-09-13 Anton KhorevMerge branch 'pull/5196'
2024-09-12 Tom HughesMerge remote-tracking branch 'upstream/pull/5204'
2024-09-12 Anton KhorevFix friendships limit flash message
2024-07-06 Anton KhorevMerge branch 'pull/4793'
2024-06-26 Andy AllanMerge pull request #4610 from AntonKhorev/no-old-note-api
2024-06-19 Andy AllanMerge pull request #4813 from AntonKhorev/no-fst-italic
2024-05-22 Andy AllanMerge pull request #4758 from tomhughes/login-referer
2024-05-22 Andy AllanMerge pull request #4816 from tomhughes/login-focus
2024-05-21 Tom HughesMerge remote-tracking branch 'upstream/pull/4822'
2024-05-21 Tom HughesFix new rubocop warnings
2023-10-26 Andy AllanMerge pull request #4170 from osmcz/cuzk
2023-09-27 Andy AllanMerge pull request #3690 from AntonKhorev/search-form...
2023-09-27 Andy AllanMerge pull request #4184 from AntonKhorev/print
2023-08-30 Andy AllanMerge pull request #4193 from AntonKhorev/lookup-friend
2023-08-30 Andy AllanMerge pull request #4197 from AntonKhorev/user-resources
2023-08-21 Anton KhorevLookup friend user before make/remove friend action
2023-08-21 Anton KhorevMove user lookup and error render to concerns
2023-02-08 Andy AllanMerge pull request #3691 from AntonKhorev/wikipedia...
2022-12-03 Tom HughesMerge remote-tracking branch 'upstream/pull/3126'
2022-11-30 Tom HughesMerge remote-tracking branch 'upstream/pull/3688'
2022-11-23 Andy AllanMerge pull request #3676 from harry-wood/notes-disappea...
2022-11-22 Tom HughesMerge remote-tracking branch 'upstream/pull/3301'
2022-11-22 Tom HughesFix new rubocop warnings
2022-09-10 Adam HoyleMerge branch 'master' into feature/add-communities...
2022-04-25 Jesse WeinsteinMerge branch 'master' into HEAD
2022-03-09 Tom HughesMerge pull request #3486 from tomhughes/vips
2022-03-09 Andy AllanMerge pull request #3491 from tomhughes/legacy-trace
2022-03-03 Tom HughesFix some rubocop Naming/PredicateName warnings
2022-03-02 Andy AllanMerge branch 'pull/3472'
2022-03-01 Tom HughesFix rubocop Rails/TimeZone warnings
2021-12-14 Adam HoyleMerge branch 'master' into feature/add-communities...
2021-11-23 Tom HughesImprove fallback behaviour for unsafe referer redirects
2021-07-18 Tom HughesMerge remote-tracking branch 'upstream/pull/3251'
2021-05-11 Tom HughesAdd rate limiting to user friendships
2021-04-08 Andy AllanMerge pull request #1558 from plarus/master
2020-10-21 Tom HughesMerge remote-tracking branch 'upstream/pull/2901'
2020-10-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2887'
2020-10-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2884'
2020-10-14 Andy AllanRename Notifier to UserMailer
2020-08-05 Tom HughesMerge remote-tracking branch 'upstream/pull/2667'
2020-07-22 Tom HughesMerge remote-tracking branch 'upstream/pull/2727'
2020-07-22 Tom HughesMerge remote-tracking branch 'upstream/pull/2725'
2020-07-22 Tom HughesFix the Redirect warnings from Brakeman
2020-06-04 Tom HughesMerge remote-tracking branch 'upstream/pull/2642'
2020-06-03 Andy AllanRename friend to friendship in notifier
2020-06-03 Andy AllanMove make_friend and remove_friend to friendships contr...