Jess Lee 1b0cb47916 Merge user and give pro users trusted role (#2176) ... * remove pro privelges from other roles and add trusted role for pros * add merge user routes and methods * add specs * add more specs * update languauge on /internal for clarity * fix code climate error		2019-03-22 16:20:31 -04:00
..
articles_controller_spec.rb	Fix articles feed not filtering articles by user/organization (#1941)	2019-03-02 07:48:55 -08:00
internal_users_controller_spec.rb	Merge user and give pro users trusted role (#2176)	2019-03-22 16:20:31 -04:00