]> git.openstreetmap.org Git - rails.git/history - app/controllers/user_blocks_controller.rb
Merge remote-tracking branch 'upstream/pull/4878'
[rails.git] / app / controllers / user_blocks_controller.rb
2024-05-15 Andy AllanMerge pull request #4633 from tomhughes/trace-images
2024-05-15 Andy AllanMerge pull request #4496 from tomhughes/disabled-auth...
2024-04-21 Tom HughesMerge remote-tracking branch 'upstream/pull/4708'
2024-04-12 Tom HughesMerge remote-tracking branch 'upstream/pull/4559'
2024-04-01 Tom HughesMerge remote-tracking branch 'upstream/pull/4637'
2024-03-29 Anton KhorevUse before/after pagination on users page
2024-02-25 Tom HughesMerge remote-tracking branch 'upstream/pull/4251'
2024-02-25 Tom HughesMerge remote-tracking branch 'upstream/pull/4272'
2024-01-24 Andy AllanMerge pull request #4401 from KasperFranz/buried-wikidata
2024-01-18 Andy AllanMerge pull request #4218 from AntonKhorev/no-user-id...
2024-01-17 Andy AllanMerge pull request #4405 from tomhughes/normalize-displ...
2024-01-07 Tom HughesMerge remote-tracking branch 'upstream/pull/4440'
2024-01-07 Anton KhorevAdd revoke all blocks action
2024-01-07 Anton KhorevAdd revoke all blocks page title
2024-01-07 Anton KhorevCreate an empty revoke all blocks page
2024-01-07 Tom HughesMerge remote-tracking branch 'upstream/pull/4433'
2023-12-28 Tom HughesMerge remote-tracking branch 'upstream/pull/4439'
2023-12-27 Anton KhorevSet block ends_at to exactly created_at + duration
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 KhorevMove user lookup and error render to concerns
2022-12-03 Tom HughesMerge remote-tracking branch 'upstream/pull/3126'
2022-09-10 Adam HoyleMerge branch 'master' into feature/add-communities...
2022-04-25 Jesse WeinsteinMerge branch 'master' into HEAD
2022-03-02 Andy AllanMerge branch 'pull/3472'
2022-03-01 Tom HughesFix rubocop Rails/TimeZone warnings
2021-04-29 Tom HughesMerge remote-tracking branch 'upstream/pull/3029'
2021-04-08 Andy AllanMerge pull request #1558 from plarus/master
2021-02-24 Andy AllanMerge branch 'pull/3091'
2021-02-09 mmd-osmPrevent CSRF bypass unblocking users
2020-09-02 Tom HughesFix rubocop Style/SoleNestedConditional warnings
2020-08-06 Tom HughesFix some new rubocop warnings
2019-08-31 Stefan BaeblerMerge branch 'master' into tag-colour-preview-rebase
2019-08-28 Tom HughesMerge remote-tracking branch 'upstream/pull/1926'
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2018-11-08 Tom HughesMerge remote-tracking branch 'upstream/pull/2051'
2018-11-07 Andy AllanMigrate UserBlocksController to use CanCanCan
2018-06-10 Tom HughesMerge branch 'master' into next
2018-04-29 J GuthrieMerge branch 'convert_roundabout_exits' of https:/...
2018-04-29 Jamie GuthrieMerge branch 'master' into convert_roundabout_exits
2018-04-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1809'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1833'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1839'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1838'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1837'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1836'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1835'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1834'
2018-04-25 Andy AllanUse lazy lookups for user_blocks translations
2018-04-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1824'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1815'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1820'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1816'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1814'
2018-04-11 Andy AllanRefactor @this_user to @user
2018-04-11 Andy AllanMerge branch 'master' into moderation
2018-03-26 Tom HughesFix new rubocop warnings
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-24 Tom HughesMerge remote-tracking branch 'upstream/pull/1658'
2017-10-22 Andy AllanAvoid using or comparing explicit model ids
2017-10-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1580'
2017-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Tom HughesMerge remote-tracking branch 'upstream/pull/1583'
2017-07-12 Andy AllanUse current_user to represent the currently logged...
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-29 Tom HughesFix more parameter sanitisation issues and add tests
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-04-14 Tom HughesFix style issues found by new rubocop version
2015-02-26 Tom HughesFix some rubocop rails style issues
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
2013-09-21 Tom HughesReplace attr_accessible with strong parameters
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-04-05 Matt AmosAdded redactions resource
2012-03-21 Tom HughesFactor out common code for looking up users
2012-03-21 Tom HughesUse one "no_such_user" view everywhere
2012-03-19 Tom HughesAdd functional tests for user blocks
2012-03-10 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-09 Tom HughesFix mass assignment errors with user blocks
2009-11-01 Tom HughesAdd :warning and :error flash messages which can be...
2009-10-13 Tom HughesMerge 17130 from trunk.
2009-10-13 Tom HughesMerged 17073:17076 from trunk.
2009-10-13 Tom HughesMerged 17047 from trunk.
2009-10-13 Tom HughesMerge 17067 from trunk.
2009-10-13 Tom HughesMerged 17256:18123 from trunk.
2009-10-06 Tom HughesMerge blocking branch to head.
2009-10-05 Tom HughesMerge 17944:17988 from trunk.
2009-10-02 Matt AmosMerging 17905:17944 from trunk.
2009-10-02 Matt AmosFix wrong comment.
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
next