Download as
Browse Code »

Commit 577ce21bd765fbd957c0aeaba265bad400734477

Authored by Weblate
2 parents 12868a92 65108142
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

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
test/functional/contact_controller_test.rb
  Diff comments   View file @577ce21
@@ -131,7 +131,7 @@ class ContactControllerTest < ActionController::TestCase @@ -131,7 +131,7 @@ class ContactControllerTest < ActionController::TestCase
131 post :new, :profile => community.identifier 131 post :new, :profile => community.identifier
132 132
133 assert_response :forbidden 133 assert_response :forbidden
134 - assert_template :access_denied 134 + assert_template :private_profile
135 end 135 end
136 136
137 should 'not show send e-mail page to non members of invisible community' do 137 should 'not show send e-mail page to non members of invisible community' do
test/functional/events_controller_test.rb
  Diff comments   View file @577ce21
@@ -60,7 +60,7 @@ class EventsControllerTest < ActionController::TestCase @@ -60,7 +60,7 @@ class EventsControllerTest < ActionController::TestCase
60 post :events, :profile => community.identifier 60 post :events, :profile => community.identifier
61 61
62 assert_response :forbidden 62 assert_response :forbidden
63 - assert_template :access_denied 63 + assert_template :private_profile
64 end 64 end
65 65
66 should 'not show events page to non members of invisible community' do 66 should 'not show events page to non members of invisible community' do