Add latest changes from gitlab-org/gitlab@master

app/views/errors/not_found.html.haml

@@ -11,5 +11,5 @@
     = form_tag search_path, method: :get, class: 'form-inline-flex' do |f|
       .field
         = search_field_tag :search, '', placeholder: _('Search for projects, issues, etc.'), class: 'form-control'
-      = button_tag 'Search', class: 'btn btn-success', name: nil, type: 'submit'
+      = button_tag _('Search'), class: 'btn btn-sm btn-success', name: nil, type: 'submit'
 = render 'errors/footer'

changelogs/unreleased/backstage-remove-export-designs-feature-flag.yml

+---
+title: Removes `export_designs` feature flag
+merge_request: 18507
+author: nate geslin
+type: other

changelogs/unreleased/patch-35.yml

+---
+title: Fix search button height on 404 page
+merge_request: 19080
+author:
+type: fixed

doc/administration/index.md

@@ -43,7 +43,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 ### Configuring GitLab
-- [Adjust your instance's timezone](../workflow/timezone.md): Customize the default time zone of GitLab.
+- [Adjust your instance's timezone](timezone.md): Customize the default time zone of GitLab.
 - [System hooks](../system_hooks/system_hooks.md): Notifications when users, projects and keys are changed.
 - [Security](../security/README.md): Learn what you can do to further secure your GitLab instance.
 - [Usage statistics, version check, and usage ping](../user/admin_area/settings/usage_statistics.md): Enable or disable information about your instance to be sent to GitLab, Inc.

doc/administration/monitoring/performance/performance_bar.md

@@ -54,7 +54,7 @@ Make sure _Enable the Performance Bar_ is checked and hit
 **Save** to save the changes.
 Once the Performance Bar is enabled, you will need to press the [<kbd>p</kbd> +
-<kbd>b</kbd> keyboard shortcut](../../../workflow/shortcuts.md) to actually
+<kbd>b</kbd> keyboard shortcut](../../../user/shortcuts.md) to actually
 display it.
 You can toggle the Bar using the same shortcut.

doc/administration/timezone.md

+# Changing your time zone
+
+The global time zone configuration parameter can be changed in `config/gitlab.yml`:
+
+```text
+# time_zone: 'UTC'
+```
+
+Uncomment and customize if you want to change the default time zone of the GitLab application.
+
+## Viewing available timezones
+
+To see all available time zones, run `bundle exec rake time:zones:all`.
+
+For Omnibus installations, run `gitlab-rake time:zones:all`.
+
+NOTE: **Note:**
+Currently, this rake task does not list timezones in TZInfo format required by GitLab Omnibus during a reconfigure: [#58672](https://gitlab.com/gitlab-org/gitlab-foss/issues/58672).
+
+## Changing time zone in Omnibus installations
+
+GitLab defaults its time zone to UTC. It has a global timezone configuration parameter in `/etc/gitlab/gitlab.rb`.
+
+To obtain a list of timezones, log in to your GitLab application server and run a command that generates a list of timezones in TZInfo format for the server. For example, install `timedatectl` and run `timedatectl list-timezones`.
+
+To update, add the timezone that best applies to your location. For example:
+
+```ruby
+gitlab_rails['time_zone'] = 'America/New_York'
+```
+
+After adding the configuration parameter, reconfigure and restart your GitLab instance:
+
+```sh
+gitlab-ctl reconfigure
+gitlab-ctl restart
+```

doc/gitlab-basics/README.md

@@ -23,6 +23,7 @@ The following are guides to basic GitLab functionality:
 - [Create a group](../user/group/index.md#create-a-new-group), to combine and administer
   projects together.
 - [Create a branch](create-branch.md), to make changes to files stored in a project's repository.
+- [Feature branch workflow](feature_branch_workflow.md).
 - [Fork a project](fork-project.md), to duplicate projects so they can be worked on in parallel.
 - [Add a file](add-file.md), to add new files to a project's repository.
 - [Create an issue](../user/project/issues/managing_issues.md#create-a-new-issue),

doc/gitlab-basics/feature_branch_workflow.md

+---
+disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
+---
+
+# Feature branch workflow
+
+1. Clone project:
+
+   ```bash
+   git clone git@example.com:project-name.git
+   ```
+
+1. Create branch with your feature:
+
+   ```bash
+   git checkout -b $feature_name
+   ```
+
+1. Write code. Commit changes:
+
+   ```bash
+   git commit -am "My feature is ready"
+   ```
+
+1. Push your branch to GitLab:
+
+   ```bash
+   git push origin $feature_name
+   ```
+
+1. Review your code on commits page.
+
+1. Create a merge request.
+
+1. Your team lead will review the code & merge it to the main branch.

doc/user/index.md

@@ -135,7 +135,7 @@ supported.
 ## Todos
-Never forget to reply to your collaborators. [GitLab Todos](../workflow/todos.md)
+Never forget to reply to your collaborators. [GitLab Todos](todos.md)
 are a tool for working faster and more effectively with your team,
 by listing all user or group mentions, as well as issues and merge
 requests you're assigned to.
@@ -150,6 +150,11 @@ requests you're assigned to.
 you have quick access to. You can also gather feedback on them through
 [Discussions](#Discussions).
+## Keyboard shortcuts
+
+There are many [keyboard shortcuts](shortcuts.md) in GitLab to help you navigate between
+pages and accomplish tasks faster.
+
 ## Integrations
 [Integrate GitLab](../integration/README.md) with your preferred tool,

doc/user/profile/preferences.md

@@ -82,7 +82,7 @@ You have 8 options here that you can use for your default dashboard view:
 - Your projects' activity
 - Starred projects' activity
 - Your groups
-- Your [Todos](../../workflow/todos.md)
+- Your [Todos](../todos.md)
 - Assigned Issues
 - Assigned Merge Requests
 - Operations Dashboard **(PREMIUM)**

doc/user/project/index.md

@@ -45,7 +45,7 @@ When you create a project in GitLab, you'll have access to a large number of
   - [Review Apps](../../ci/review_apps/index.md): Live preview the results
   of the changes proposed in a merge request in a per-branch basis
 - [Labels](labels.md): Organize issues and merge requests by labels
-- [Time Tracking](../../workflow/time_tracking.md): Track estimate time
+- [Time Tracking](time_tracking.md): Track estimate time
   and time spent on
   the conclusion of an issue or merge request
 - [Milestones](milestones/index.md): Work towards a target date

doc/user/project/issues/csv_export.md

@@ -67,8 +67,8 @@ Data will be encoded with a comma as the column delimiter, with `"` used to quot
 | Milestone | Title of the issue milestone |
 | Weight | Issue weight |
 | Labels | Title of any labels joined with a `,` |
-| Time Estimate | [Time estimate](../../../workflow/time_tracking.md#estimates) in seconds |
-| Time Spent | [Time spent](../../../workflow/time_tracking.md#time-spent) in seconds |
+| Time Estimate | [Time estimate](../time_tracking.md#estimates) in seconds |
+| Time Spent | [Time spent](../time_tracking.md#time-spent) in seconds |
 ## Limitations

doc/user/project/issues/design_management.md

@@ -38,8 +38,6 @@ to be enabled:
 - Files uploaded must have a file extension of either `png`, `jpg`, `jpeg`, `gif`, `bmp`, `tiff` or `ico`.
   The [`svg` extension is not yet supported](https://gitlab.com/gitlab-org/gitlab/issues/12771).
 - Design uploads are limited to 10 files at a time.
-- Design Management is
-  [not yet supported in the project export](https://gitlab.com/gitlab-org/gitlab/issues/11090).
 - Design Management data
   [isn't deleted when a project is destroyed](https://gitlab.com/gitlab-org/gitlab/issues/13429) yet.
 - Design Management data [won't be moved](https://gitlab.com/gitlab-org/gitlab/issues/13426)