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	Removed unnecessary 'reason for warning' in internal (#2128)	2019-03-20 12:58:41 -04:00
broadcasts	Initial commit	2018-02-28 16:11:08 -05:00
comments	Last general linting sweep (#1947)	2019-03-02 07:47:14 -08:00
dogfood	Last general linting sweep (#1947)	2019-03-02 07:47:14 -08:00
events	Fix linting issues in app/views/internal (#1882) [ci skip]	2019-02-25 15:19:08 -05:00
feedback_messages	Last general linting sweep (#1947)	2019-03-02 07:47:14 -08:00
members	Fix linting issues in app/views/internal (#1882) [ci skip]	2019-02-25 15:19:08 -05:00
tags	Add SRI to script tags where applicable (#2153)	2019-03-22 14:14:59 -04:00
users	Merge user and give pro users trusted role (#2176)	2019-03-22 16:20:31 -04:00
welcome	Last general linting sweep (#1947)	2019-03-02 07:47:14 -08:00