]> git.openstreetmap.org Git - rails.git/history - app/controllers/user_roles_controller.rb
Merge remote-tracking branch 'upstream/pull/5398'
[rails.git] / app / controllers / user_roles_controller.rb
2024-11-27 Andy AllanMerge pull request #4316 from AntonKhorev/block-reason...
2024-11-18 Anton KhorevMerge branch 'pull/5297'
2024-11-13 Andy AllanMerge pull request #4761 from AntonKhorev:dark-mode...
2024-11-13 Andy AllanMerge pull request #5151 from AntonKhorev/no-history...
2024-11-13 Andy AllanMerge pull request #5293 from AntonKhorev/user-roles...
2024-11-06 Anton KhorevUse resourceful routes for granting/revoking user roles
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-31 Tom HughesMerge remote-tracking branch 'upstream/pull/4212'
2023-08-30 Tom HughesMerge remote-tracking branch 'upstream/pull/4210'
2023-08-30 Tom HughesMerge remote-tracking branch 'upstream/pull/4209'
2023-08-30 Andy AllanAvoid using _id in queries
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
2023-08-17 Tom HughesMerge remote-tracking branch 'upstream/pull/4171'
2023-08-16 Andy AllanMerge pull request #4133 from AntonKhorev/flex-leaflet...
2023-08-16 Andy AllanMerge pull request #4150 from AntonKhorev/note-table...
2023-08-16 Andy AllanMerge pull request #4156 from AntonKhorev/bootstrap...
2023-08-16 Andy AllanMerge pull request #4148 from tomhughes/avatar-image
2023-08-16 Andy AllanMerge pull request #4173 from AntonKhorev/comments
2023-08-16 Andy AllanMerge pull request #4172 from tomhughes/user-predicates
2023-08-15 Tom HughesFix predicate method names in the user model
2022-04-25 Jesse WeinsteinMerge branch 'master' into HEAD
2021-04-08 Andy AllanMerge pull request #1558 from plarus/master
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-28 Tom HughesMerge remote-tracking branch 'upstream/pull/2078'
2018-11-28 Andy AllanUse CanCanCan for user_roles auth
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-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-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1788'
2018-03-21 Andy AllanUse user_path links. Fixes #1785
2018-02-04 Tom HughesMerge remote-tracking branch 'upstream/pull/1704'
2018-02-03 Tom HughesMerge remote-tracking branch 'upstream/pull/1693'
2018-01-21 Andy AllanMerge branch 'master' into moderation
2018-01-13 Tom HughesMerge remote-tracking branch 'upstream/pull/1707'
2017-12-19 mmd-osmRevoking administrator role on current user should...
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-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-02 Tom HughesRemove conditions from delete_all
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
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-03-21 Tom HughesFactor out common code for looking up users
2012-03-21 Tom HughesUse one "no_such_user" view everywhere
2012-03-20 Tom HughesAdd functional tests for the user_roles controller
2012-03-20 Tom HughesGet rid of custom CSRF protection for user role changes
2012-03-08 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-06 Tom HughesTurn on mass assignment protection
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-01 Tom HughesCorrect comment.
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-10-01 Matt AmosRefactored user_role and controller. Now much more...
2009-09-29 Matt AmosNew migration to add better auditing to user_roles...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosAdded a confirmation step to the process of granting...
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...