Merge remote-tracking branch 'upstream/pull/2225'
[rails.git] / test / controllers / user_roles_controller_test.rb
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-11-04 Tom HughesMerge remote-tracking branch 'upstream/pull/2009'
2018-10-10 Andy AllanMerge branch 'authz' of https://github.com/rubyforgood...
2018-10-09 ENT8RMerge branch 'master' into notes-search
2018-10-03 Tom HughesMerge remote-tracking branch 'upstream/pull/2010'
2018-10-03 Tom HughesMerge remote-tracking branch 'upstream/pull/2014'
2018-10-03 Andy AllanRename user_controller to users_controller
2018-10-03 Andy AllanMerge branch 'master' into messages
2018-09-10 Tom HughesMerge remote-tracking branch 'upstream/pull/1987'
2018-09-10 Tom HughesMerge remote-tracking branch 'upstream/pull/1986'
2018-09-10 Andy AllanJust pass the user object, rather than the display_name...
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-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-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1561'
2017-06-27 Tom HughesUpdate get/post etc to remove use of deprecated syntax
2017-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1483'
2017-03-09 Andy AllanCreate a super_user factory.
2017-03-06 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1477'
2017-03-06 Andy AllanUse user factory for user_roles_controller tests.
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-02-20 Tom HughesStandardise on double quoted strings
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2014-03-08 Richard FairhurstMerge pull request #14 from tomhughes/routing
2014-03-08 Tom HughesMerge remote-tracking branch 'origin/master' into routing
2014-03-08 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2014-02-26 Tom HughesReorganise tests to match modern rails test layout