. . . "The ordinance was approved by the city council on May 28, and consolidates city bans on discrimination based on sex, race, age, religion and other categories and increases protections for gay and transgender residents." . . .