Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 8 deletions

diff --git a/doc/administration/timezone.md b/doc/administration/timezone.md
index bc94110c5b6..0006a442ec9 100644
--- a/doc/administration/timezone.md
+++ b/doc/administration/timezone.md
@@ -44,15 +44,17 @@ gitlab-ctl restart
 
 ## Changing time zone per user
 
-To allow users to change the time zone in their profile, the feature flag `user_time_settings` should be enabled:
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/57654) in GitLab 11.11, disabled by default behind `user_time_settings` [feature flag](feature_flags.md).
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 13.9.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 14.1.
 
-1. [Start a Rails console session](operations/rails_console.md).
-1. Enable the feature flag:
+This setting controls the local time displayed on a user's profile.
+See [&280](https://gitlab.com/groups/gitlab-org/-/epics/280) for other planned features.
 
-   ```ruby
-   Feature.enable(:user_time_settings)
-   ```
+NOTE:
+If a user has not set their time zone, it defaults to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the default time zone is UTC.
 
-1. You should now be able to see the timezone dropdown in the users' **Settings > Profile** page.
+1. Navigate to [your user settings](../user/profile/index.md#access-your-user-settings).
+1. Select your time zone from the dropdown.
 
-   ![User Time Zone Settings](img/time_zone_settings.png)
+![User Time Zone Settings](img/time_zone_settings.png)