Commit
c973762c78fcbd61b21d6c4aac94d0e26cd2e4ac
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Don't allow profiles named 'plugin'
| @@ -152,6 +152,7 @@ class Profile < ActiveRecord::Base |
| @@ -152,6 +152,7 @@ class Profile < ActiveRecord::Base |
152
| assets |
152
| assets |
153
| doc |
153
| doc |
154
| chat |
154
| chat |
| |
155
| + plugin |
155
| ] |
156
| ] |
156
| |
157
| |
157
| belongs_to :user |
158
| belongs_to :user |
| @@ -131,6 +131,7 @@ class ProfileTest < Test::Unit::TestCase |
| @@ -131,6 +131,7 @@ class ProfileTest < Test::Unit::TestCase |
131
| assert_invalid_identifier 'info' |
131
| assert_invalid_identifier 'info' |
132
| assert_invalid_identifier 'root' |
132
| assert_invalid_identifier 'root' |
133
| assert_invalid_identifier 'assets' |
133
| assert_invalid_identifier 'assets' |
| |
134
| + assert_invalid_identifier 'plugin' |
134
| end |
135
| end |
135
| |
136
| |
136
| should 'provide recent documents' do |
137
| should 'provide recent documents' do |