modify some old comments

pull/15257/head
ibrahim 5 years ago
parent c8ce6ffdc8
commit 3d2812b443

@ -2931,7 +2931,7 @@ Now, back to the new features!
* Full screen options are enabled by default for public visualizations
* Empty the_geom from CSV no longer imports to "" instead of NULL
* Trying to change a password no longer returns unauthorized
* User destroy no longer fails when he has named maps
* User destroy no longer fails when she/he has named maps
* /api/v1/tables returns 404 when table does not exist

@ -2,7 +2,7 @@
@import "../variables/colors";
@import "../variables/sizes";
// Append a standard dropdown triangle icon next to he right of the text of the link, like "foobar v".
// Append a standard dropdown triangle icon next to the right of the text of the link, like "foobar v".
// Usage is as simple as:
// <a href="#" class="DropdownLink">My text</a>
//

@ -119,8 +119,8 @@ class UserMailer < ActionMailer::Base
private
# If user has been created by the admin he needs to tell him the password.
# If he has signed in through the page he doesn't.
# If user has been created by the admin they need to tell them the password.
# If user has signed in through the page they doesn't.
def user_needs_password(user)
!user.google_sign_in && user.enable_account_token.nil? && !user.created_with_invitation?
end

@ -2,7 +2,7 @@
@import "../variables/colors";
@import "../variables/sizes";
// Append a standard dropdown triangle icon next to he right of the text of the link, like "foobar v".
// Append a standard dropdown triangle icon next to the right of the text of the link, like "foobar v".
// Usage is as simple as:
// <a href="#" class="DropdownLink">My text</a>
//

@ -30,5 +30,5 @@ Even more, if you want not only *authentication* (authenticating existing users)
* ``email``: value of the header (``alice@myorg.com``).
* ``username``: user of the email ( ``alice``).
* ``password``: random. He can change it in his account page.
* ``password``: random. they can change it in their account page.
* ``organization``: taken from the subdomain (``myorg``).

@ -57,7 +57,7 @@ namespace :cartodb do
end
end
# Then, remove permissions of everything he has access to
# Then, remove permissions of everything they have access to
CartoDB::SharedEntity.where(recipient_id: user.id).each do |shared_entity|
permissions = CartoDB::Permission.where(entity_id: shared_entity.entity_id)
permissions.each do |permission|

@ -34,7 +34,7 @@ shared_examples_for "user models" do
end
it 'is enabled if organization has it enabled and with custom config, no matter whether user has it or not,
and enabled if he has it enabled and with custom config, no matter whether org has it or not' do
and enabled if he/she has it enabled and with custom config, no matter whether org has it or not' do
twitter_search_conf = @config[:datasource_search]['twitter_search']
custom_wadus = {
"auth_required" => false,

@ -615,7 +615,7 @@ describe Admin::OrganizationUsersController do
@user.destroy if @user
end
it 'owner cannot enable soft limits if he has not' do
it 'owner cannot enable soft limits if she/he has not' do
old_limits = update_soft_limits(@org_user_owner, false)
post create_organization_user_url(user_domain: @org_user_owner.username),
@ -628,7 +628,7 @@ describe Admin::OrganizationUsersController do
update_soft_limits(@org_user_owner, old_limits)
end
it 'owner cannot enable geocoding limit if he has not' do
it 'owner cannot enable geocoding limit if she/he has not' do
old_limits = update_soft_limits(@org_user_owner, false)
post create_organization_user_url(user_domain: @org_user_owner.username),
@ -656,7 +656,7 @@ describe Admin::OrganizationUsersController do
update_soft_limits(@org_user_owner, old_limits)
end
it 'owner can enable soft limits if he has' do
it 'owner can enable soft limits if she/he has' do
old_limits = update_soft_limits(@org_user_owner, true)
post create_organization_user_url(user_domain: @org_user_owner.username),
@ -676,7 +676,7 @@ describe Admin::OrganizationUsersController do
::User[@existing_user.id].destroy if @existing_user
end
it 'owner cannot enable soft limits if he has not' do
it 'owner cannot enable soft limits if she/he has not' do
old_limits = update_soft_limits(@org_user_owner, false)
check_soft_limits(@carto_org_user_owner, false)
@existing_user = FactoryGirl.create(:carto_user,
@ -692,7 +692,7 @@ describe Admin::OrganizationUsersController do
update_soft_limits(@org_user_owner, old_limits)
end
it 'owner can enable soft limits if he has' do
it 'owner can enable soft limits if she/he has' do
old_limits = update_soft_limits(@org_user_owner, true)
@existing_user = FactoryGirl.create(:carto_user,
soft_limits_params(false).merge(organization: @carto_organization))
@ -707,7 +707,7 @@ describe Admin::OrganizationUsersController do
update_soft_limits(@org_user_owner, old_limits)
end
it 'owner can disable soft limits if he has' do
it 'owner can disable soft limits if she/he has' do
old_limits = update_soft_limits(@org_user_owner, true)
@existing_user = FactoryGirl.create(:carto_user,
soft_limits_params(true).merge(organization: @carto_organization))

Loading…
Cancel
Save