]> git.openstreetmap.org Git - rails.git/history - app/models/acl.rb
Handle current_user being both an admin and a moderator for building user list
[rails.git] / app / models / acl.rb
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-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1339'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1338'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1337'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1336'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1335'
2016-10-26 Andy AllanConvert ACL fixture to a factory, and add some tests
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-02-20 Tom HughesFix rubocop lint issues
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2014-11-03 Richard FairhurstMerge pull request #24 from zerebubuth/routing-merge
2014-11-03 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2014-06-15 Tom HughesMerge branch 'master' into overpass
2014-06-03 Tom HughesAdd support for ACL blocks on note commenting
2012-03-08 Tom HughesMerge branch 'master' into openstreetbugs
2012-02-12 Tom HughesMake ACLs match when the address is equal
2012-02-08 Tom HughesAdd convenience methods to make ACL use simpler
2012-02-08 Tom HughesAdd support for domain based ACLs
2012-02-08 Tom HughesCombine the address and netmask for an ACL in one column
2012-02-08 Tom HughesStop pretending we support MySQL
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesUpdate ActiveRecord queries to use arel
2009-04-20 Tom HughesMerge api06 branch to trunk.
2009-04-16 Tom HughesMerge 14394:14533 from trunk.
2009-04-16 Tom HughesCope with MySQL and Postgres.
2009-04-13 Shaun McDonaldreverting last change, which included posgres config...
2009-04-13 Shaun McDonaldRemove duplication that is in the test helper. Adding...
2009-03-08 Tom HughesCommit ACL related files from earlier merges as svn...
2009-03-08 Tom HughesMerge 12304:14009 from trunk.
2009-02-19 Tom HughesAdd an ACL system to allow key/value pairs to be attach...