]> git.openstreetmap.org Git - rails.git/history - app/models/user_role.rb
Merge remote-tracking branch 'upstream/pull/4110'
[rails.git] / app / models / user_role.rb
2022-04-25 Jesse WeinsteinMerge branch 'master' into HEAD
2021-04-08 Andy AllanMerge pull request #1558 from plarus/master
2020-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2431'
2020-02-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2381'
2019-12-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2444'
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-08-31 Stefan BaeblerMerge branch 'master' into tag-colour-preview-rebase
2019-08-28 Tom HughesMerge remote-tracking branch 'upstream/pull/1926'
2019-06-27 mmdMerge branch 'master' into patch/view_migration
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2207'
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-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
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-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-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1423'
2017-02-02 Andy AllanAdd a user_role factory
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'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1120'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1122'
2016-01-19 Tom HughesFix rubocop warnings
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 HughesFix most auto-correctable rubocop issues
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 Matt AmosMerging 17846:17904 from trunk.
2009-10-01 Matt AmosRefactored user_role and controller. Now much more...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...