diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
index d8b698973a4..fb2c0766b7c 100644
--- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION
+++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
@@ -1 +1 @@
-2.12.0
+2.13.0
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f72e8fdb138..bbc484cc434 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -48,6 +48,7 @@ class Issue < ApplicationRecord
   belongs_to :duplicated_to, class_name: 'Issue'
   belongs_to :closed_by, class_name: 'User'
   belongs_to :iteration, foreign_key: 'sprint_id'
+  belongs_to :work_item_type, class_name: 'WorkItem::Type', inverse_of: :work_items
 
   belongs_to :moved_to, class_name: 'Issue'
   has_one :moved_from, class_name: 'Issue', foreign_key: :moved_to_id
diff --git a/app/models/work_item/type.rb b/app/models/work_item/type.rb
new file mode 100644
index 00000000000..f3738c0aec9
--- /dev/null
+++ b/app/models/work_item/type.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Note: initial thinking behind `icon_name` is for it to do triple duty:
+# 1. one of our svg icon names, such as `external-link` or a new one `bug`
+# 2. if it's an absolute url, then url to a user uploaded icon/image
+# 3. an emoji, with the format of `:smile:`
+class WorkItem::Type < ApplicationRecord
+  self.table_name = 'work_item_types'
+
+  include CacheMarkdownField
+
+  cache_markdown_field :description, pipeline: :single_line
+
+  enum base_type: Issue.issue_types
+
+  belongs_to :group, foreign_key: :namespace_id, optional: true
+  has_many :work_items, class_name: 'Issue', foreign_key: :work_item_type_id, inverse_of: :work_item_type
+
+  before_validation :strip_whitespace
+
+  # TODO: review validation rules
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/336919
+  validates :name, presence: true
+  validates :name, uniqueness: { case_sensitive: false, scope: [:namespace_id] }
+  validates :name, length: { maximum: 255 }
+  validates :icon_name, length: { maximum: 255 }
+
+  private
+
+  def strip_whitespace
+    name&.strip!
+  end
+end
diff --git a/app/views/search/results/_blob_data.html.haml b/app/views/search/results/_blob_data.html.haml
index fb2825ad15e..b2f2b9396c7 100644
--- a/app/views/search/results/_blob_data.html.haml
+++ b/app/views/search/results/_blob_data.html.haml
@@ -7,5 +7,12 @@
           = search_blob_title(project, path)
       = copy_file_path_button(path)
     - if blob.data
-      .file-content.code.term{ data: { qa_selector: 'file_text_content' } }
-        = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, blob_link: blob_link, highlight_line: blob.highlight_line
+      - if blob.data.size > 0
+        .file-content.code.term{ data: { qa_selector: 'file_text_content' } }
+          = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, blob_link: blob_link, highlight_line: blob.highlight_line
+      - else
+        .file-content.code
+          .nothing-here-block
+            .gl-text-gray-600.gl-font-sm
+              - max_file_size_indexed = Gitlab::CurrentSettings.elasticsearch_indexed_file_size_limit_kb.kilobytes
+              = _('The file could not be displayed because it is empty or larger than the maximum file size indexed (%{size}).') % { size: number_to_human_size(max_file_size_indexed) }
diff --git a/db/migrate/20210709221051_create_work_item_types.rb b/db/migrate/20210709221051_create_work_item_types.rb
new file mode 100644
index 00000000000..749689811e0
--- /dev/null
+++ b/db/migrate/20210709221051_create_work_item_types.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class CreateWorkItemTypes < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    create_table_with_constraints :work_item_types do |t|
+      t.integer :base_type, limit: 2, default: 0, null: false
+      t.integer :cached_markdown_version
+      t.text :name, null: false
+      t.text :description # rubocop:disable Migration/AddLimitToTextColumns
+      t.text :description_html # rubocop:disable Migration/AddLimitToTextColumns
+      t.text :icon_name, null: true
+      t.references :namespace, foreign_key: { on_delete: :cascade }, index: false, null: true
+      t.timestamps_with_timezone null: false
+
+      t.text_limit :name, 255
+      t.text_limit :icon_name, 255
+    end
+
+    add_concurrent_index :work_item_types,
+                         'namespace_id, TRIM(BOTH FROM LOWER(name))',
+                         unique: true,
+                         name: :work_item_types_namespace_id_and_name_unique
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :work_item_types
+    end
+  end
+end
diff --git a/db/migrate/20210709221659_add_work_item_type_id_to_issue.rb b/db/migrate/20210709221659_add_work_item_type_id_to_issue.rb
new file mode 100644
index 00000000000..38292cd37c5
--- /dev/null
+++ b/db/migrate/20210709221659_add_work_item_type_id_to_issue.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddWorkItemTypeIdToIssue < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    unless column_exists?(:issues, :work_item_type_id)
+      with_lock_retries do
+        add_column :issues, :work_item_type_id, :bigint
+      end
+    end
+
+    add_concurrent_index :issues, :work_item_type_id
+    add_concurrent_foreign_key :issues, :work_item_types, column: :work_item_type_id, on_delete: nil
+  end
+
+  def down
+    if foreign_key_exists?(:issues, :work_item_types)
+      remove_foreign_key :issues, column: :work_item_type_id
+    end
+
+    with_lock_retries do
+      remove_column :issues, :work_item_type_id
+    end
+  end
+end
diff --git a/db/schema_migrations/20210709221051 b/db/schema_migrations/20210709221051
new file mode 100644
index 00000000000..1c2f47e20ad
--- /dev/null
+++ b/db/schema_migrations/20210709221051
@@ -0,0 +1 @@
+7847339fb7b143845e2715b15505016dc8e6de3fbd2c5cb4bae55da4f25a5a5f
\ No newline at end of file
diff --git a/db/schema_migrations/20210709221659 b/db/schema_migrations/20210709221659
new file mode 100644
index 00000000000..f6626986920
--- /dev/null
+++ b/db/schema_migrations/20210709221659
@@ -0,0 +1 @@
+5bec34d517f3f2bbb9735f73fb5641512c9f5286ee5d7a59b17c976dd1459347
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 8496f869c32..dde66bfbf61 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14341,6 +14341,7 @@ CREATE TABLE issues (
     issue_type smallint DEFAULT 0 NOT NULL,
     blocking_issues_count integer DEFAULT 0 NOT NULL,
     upvotes_count integer DEFAULT 0 NOT NULL,
+    work_item_type_id bigint,
     CONSTRAINT check_fba63f706d CHECK ((lock_version IS NOT NULL))
 );
 
@@ -19769,6 +19770,30 @@ CREATE SEQUENCE wiki_page_slugs_id_seq
 
 ALTER SEQUENCE wiki_page_slugs_id_seq OWNED BY wiki_page_slugs.id;
 
+CREATE TABLE work_item_types (
+    id bigint NOT NULL,
+    base_type smallint DEFAULT 0 NOT NULL,
+    cached_markdown_version integer,
+    name text NOT NULL,
+    description text,
+    description_html text,
+    icon_name text,
+    namespace_id bigint,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    CONSTRAINT check_104d2410f6 CHECK ((char_length(name) <= 255)),
+    CONSTRAINT check_fecb3a98d1 CHECK ((char_length(icon_name) <= 255))
+);
+
+CREATE SEQUENCE work_item_types_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE work_item_types_id_seq OWNED BY work_item_types.id;
+
 CREATE TABLE x509_certificates (
     id bigint NOT NULL,
     created_at timestamp with time zone NOT NULL,
@@ -20748,6 +20773,8 @@ ALTER TABLE ONLY wiki_page_meta ALTER COLUMN id SET DEFAULT nextval('wiki_page_m
 
 ALTER TABLE ONLY wiki_page_slugs ALTER COLUMN id SET DEFAULT nextval('wiki_page_slugs_id_seq'::regclass);
 
+ALTER TABLE ONLY work_item_types ALTER COLUMN id SET DEFAULT nextval('work_item_types_id_seq'::regclass);
+
 ALTER TABLE ONLY x509_certificates ALTER COLUMN id SET DEFAULT nextval('x509_certificates_id_seq'::regclass);
 
 ALTER TABLE ONLY x509_commit_signatures ALTER COLUMN id SET DEFAULT nextval('x509_commit_signatures_id_seq'::regclass);
@@ -22499,6 +22526,9 @@ ALTER TABLE ONLY wiki_page_meta
 ALTER TABLE ONLY wiki_page_slugs
     ADD CONSTRAINT wiki_page_slugs_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY work_item_types
+    ADD CONSTRAINT work_item_types_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY x509_certificates
     ADD CONSTRAINT x509_certificates_pkey PRIMARY KEY (id);
 
@@ -24035,6 +24065,8 @@ CREATE INDEX index_issues_on_updated_at ON issues USING btree (updated_at);
 
 CREATE INDEX index_issues_on_updated_by_id ON issues USING btree (updated_by_id) WHERE (updated_by_id IS NOT NULL);
 
+CREATE INDEX index_issues_on_work_item_type_id ON issues USING btree (work_item_type_id);
+
 CREATE INDEX index_iterations_cadences_on_group_id ON iterations_cadences USING btree (group_id);
 
 CREATE UNIQUE INDEX index_jira_connect_installations_on_client_key ON jira_connect_installations USING btree (client_key);
@@ -25547,6 +25579,8 @@ CREATE UNIQUE INDEX vulnerability_feedback_unique_idx ON vulnerability_feedback
 
 CREATE UNIQUE INDEX vulnerability_occurrence_pipelines_on_unique_keys ON vulnerability_occurrence_pipelines USING btree (occurrence_id, pipeline_id);
 
+CREATE UNIQUE INDEX work_item_types_namespace_id_and_name_unique ON work_item_types USING btree (namespace_id, btrim(lower(name)));
+
 ALTER INDEX index_product_analytics_events_experimental_project_and_time ATTACH PARTITION gitlab_partitions_static.product_analytics_events_expe_project_id_collector_tstamp_idx10;
 
 ALTER INDEX index_product_analytics_events_experimental_project_and_time ATTACH PARTITION gitlab_partitions_static.product_analytics_events_expe_project_id_collector_tstamp_idx11;
@@ -26372,6 +26406,9 @@ ALTER TABLE ONLY vulnerabilities
 ALTER TABLE ONLY project_access_tokens
     ADD CONSTRAINT fk_b27801bfbf FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY issues
+    ADD CONSTRAINT fk_b37be69be6 FOREIGN KEY (work_item_type_id) REFERENCES work_item_types(id);
+
 ALTER TABLE ONLY protected_tag_create_access_levels
     ADD CONSTRAINT fk_b4eb82fe3c FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
@@ -26849,6 +26886,9 @@ ALTER TABLE ONLY approval_merge_request_rules_groups
 ALTER TABLE ONLY vulnerability_feedback
     ADD CONSTRAINT fk_rails_20976e6fd9 FOREIGN KEY (pipeline_id) REFERENCES ci_pipelines(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY work_item_types
+    ADD CONSTRAINT fk_rails_20f694a960 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY user_statuses
     ADD CONSTRAINT fk_rails_2178592333 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
 
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index 383562362f4..bd1be0981ce 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -626,8 +626,8 @@ Reports that go over the 20 MB limit won't be loaded. Affected reports:
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8638) in GitLab 13.3.
 
 You can set a limit on the content of repository files that are indexed in
-Elasticsearch. Any files larger than this limit is neither indexed
-nor searchable.
+Elasticsearch. Any files larger than this limit only index the file name. 
+The file content is neither indexed nor searchable.
 
 Setting a limit helps reduce the memory usage of the indexing processes and
 the overall index size. This value defaults to `1024 KiB` (1 MiB) as any
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index dd402f800e3..5b21e8027a4 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -294,8 +294,8 @@ To use an external Prometheus server:
 You can visit `http://localhost:9090` for the dashboard that Prometheus offers by default.
 
 If SSL has been enabled on your GitLab instance, you may not be able to access
-Prometheus on the same browser as GitLab if using the same FQDN due to [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security). We plan to
-[provide access via GitLab](https://gitlab.com/gitlab-org/multi-user-prometheus), but in the interim there are
+Prometheus on the same browser as GitLab if using the same FQDN due to [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security).
+[A test project exists](https://gitlab.com/gitlab-org/multi-user-prometheus) to provide access via GitLab, but in the interim there are
 some workarounds: using a separate FQDN, using server IP, using a separate browser for Prometheus, resetting HSTS, or
 having [NGINX proxy it](https://docs.gitlab.com/omnibus/settings/nginx.html#inserting-custom-nginx-settings-into-the-gitlab-server-block).
 
diff --git a/doc/user/admin_area/settings/help_page.md b/doc/user/admin_area/settings/help_page.md
index 8257302d578..f941b5e69f2 100644
--- a/doc/user/admin_area/settings/help_page.md
+++ b/doc/user/admin_area/settings/help_page.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: howto
 ---
 
-# Customize the Help and sign-in page messages
+# Customize the Help and sign-in page messages **(FREE SELF)**
 
 In large organizations, it is useful to have information about who to contact or where
 to go for help. You can customize and display this information on the GitLab `/help` page and on
@@ -17,32 +17,39 @@ You can add a help message, which is shown at the top of the GitLab `/help` page
 <https://gitlab.com/help>):
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings > Preferences**, then expand **Help page**.
-1. Under **Additional text to show on the Help page**, fill in the information you wish to display on `/help`.
-1. Select **Save changes**. You can now see the message on `/help`.
+1. On the left sidebar, select **Settings > Preferences**.
+1. Expand **Sign-in and Help page**.
+1. In **Additional text to show on the Help page**, enter the information you want to display on `/help`.
+1. Select **Save changes**.
+
+You can now see the message on `/help`.
 
 NOTE:
 By default, `/help` is visible to unauthenticated users. However, if the
 [**Public** visibility level](visibility_and_access_controls.md#restricted-visibility-levels)
 is restricted, `/help` is visible only to signed-in users.
 
-## Add a help message to the sign-in page **(STARTER)**
+## Add a help message to the sign-in page
 
 You can add a help message, which is shown on the GitLab sign-in page. The message appears in a new
 section titled **Need Help?**, located below the sign-in page message:
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings > Preferences**, then expand **Help page**.
-1. Under **Additional text to show on the sign-in page**, fill in the information you wish to
+1. On the left sidebar, select **Settings > Preferences**.
+1. Expand **Sign-in and Help page**.
+1. In **Additional text to show on the sign-in page**, enter the information you want to
    display on the sign-in page.
-1. Select **Save changes**. You can now see the message on the sign-in page.
+1. Select **Save changes**.
+
+You can now see the message on the sign-in page.
 
 ## Hide marketing-related entries from the Help page
 
 GitLab marketing-related entries are occasionally shown on the Help page. To hide these entries:
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings > Preferences**, then expand **Help page**.
+1. On the left sidebar, select **Settings > Preferences**.
+1. Expand **Sign-in and Help page**.
 1. Select the **Hide marketing-related entries from the Help page** checkbox.
 1. Select **Save changes**.
 
@@ -54,8 +61,9 @@ You can specify a custom URL to which users are directed when they:
 - Select **See our website for help** on the Help page.
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings > Preferences**, then expand **Help page**.
-1. Enter the URL in the **Support page URL** field.
+1. On the left sidebar, select **Settings > Preferences**.
+1. Expand **Sign-in and Help page**.
+1. In the **Support page URL** field, enter the URL.
 1. Select **Save changes**.
 
 ## Redirect GitLab documentation links
@@ -72,8 +80,9 @@ Documentation links go to the `/help` section on the instance by default, but yo
 redirect these links to an external documentation site like `https://docs.gitlab.com`:
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings > Preferences**, then expand **Help page**.
-1. Enter the URL in the **Documentation pages URL** field.
+1. In the left sidebar, select **Settings > Preferences**.
+1. Expand **Sign-in and Help page**.
+1. In the **Documentation pages URL** field, enter the URL.
 1. Select **Save changes**.
 
 <!-- ## Troubleshooting
diff --git a/doc/user/analytics/index.md b/doc/user/analytics/index.md
index 0d3677fc07d..165826a1054 100644
--- a/doc/user/analytics/index.md
+++ b/doc/user/analytics/index.md
@@ -27,9 +27,9 @@ When we describe GitLab analytics, we use the following terms:
       [production environment](../../ci/environments/index.md#deployment-tier-of-environments) for
       all MRs deployed in the given time period. This measure under-estimates lead time because
       merge time is always later than commit time. The
-      [standard definition](https://github.com/GoogleCloudPlatform/fourkeys/blob/main/METRICS.md#lead-time-for-changes) uses median commit time. We plan to start
-      [measuring from "issue first commit"](https://gitlab.com/gitlab-org/gitlab/-/issues/328459)
-      as a better proxy, although still imperfect.
+      [standard definition](https://github.com/GoogleCloudPlatform/fourkeys/blob/main/METRICS.md#lead-time-for-changes) uses median commit time.
+      [An issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/328459) to start
+      measuring from "issue first commit" as a better proxy, although still imperfect.
 
   - **Stability**
     - **Change Failure Rate:** The percentage of deployments causing a failure in production.
diff --git a/doc/user/clusters/integrations.md b/doc/user/clusters/integrations.md
index d2861ce2946..5e6843144fc 100644
--- a/doc/user/clusters/integrations.md
+++ b/doc/user/clusters/integrations.md
@@ -22,8 +22,8 @@ Although, the [Cluster management project template](management_project_template.
 requires that you manually do the last steps of these sections,
 [Enable Prometheus integration for your cluster](#enable-prometheus-integration-for-your-cluster)
 or [Enable Elastic Stack integration for your cluster](#enable-elastic-stack-integration-for-your-cluster)
-depending on which application you are installing. We plan to also automate this step in the future,
-see the [opened issue](https://gitlab.com/gitlab-org/gitlab/-/issues/326565).
+depending on which application you are installing. [An issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/326565)
+to automate this step.
 
 ## Prometheus cluster integration
 
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index fad9b67eee4..e079e6dcbee 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -54,9 +54,10 @@ See the epic for:
 If you find an issue that isn't listed, please leave a comment on the epic or create a
 new issue.
 
-Dark mode is available as a navigation theme, for MVC and compatibility reasons. In
-the future, we plan to make it configurable in its own section along with support for
-[different navigation themes](https://gitlab.com/gitlab-org/gitlab/-/issues/219512).
+Dark mode is available as a navigation theme, for MVC and compatibility reasons.
+[An issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/219512)
+to make it configurable in its own section along with support for
+different navigation themes.
 
 Dark theme only works with the **Dark** syntax highlighting theme.
 
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index a84978a2a80..c699ff36170 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -230,6 +230,7 @@ excluded_attributes:
     - :blocking_issues_count
     - :service_desk_reply_to
     - :upvotes_count
+    - :work_item_type_id
   merge_request:
     - :milestone_id
     - :sprint_id
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 90e493f0a96..c9954f2f71b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3903,7 +3903,7 @@ msgstr ""
 msgid "Any encrypted tokens"
 msgstr ""
 
-msgid "Any files larger than this limit will not be indexed, and thus will not be searchable."
+msgid "Any files larger than this limit only index the file name. The file content is neither indexed nor searchable."
 msgstr ""
 
 msgid "Any label"
@@ -32876,6 +32876,9 @@ msgstr ""
 msgid "The file containing the export is not available yet; it may still be transferring. Please try again later."
 msgstr ""
 
+msgid "The file could not be displayed because it is empty or larger than the maximum file size indexed (%{size})."
+msgstr ""
+
 msgid "The file has been successfully created."
 msgstr ""
 
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index b276e6f8cfc..0edc2b6027d 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -20,4 +20,5 @@ FactoryBot.define do
   sequence(:jira_title) { |n| "[PROJ-#{n}]: fix bug" }
   sequence(:jira_branch) { |n| "feature/PROJ-#{n}" }
   sequence(:job_name) { |n| "job #{n}" }
+  sequence(:work_item_type_name) { |n| "bug#{n}" }
 end
diff --git a/spec/factories/work_item/work_item_types.rb b/spec/factories/work_item/work_item_types.rb
new file mode 100644
index 00000000000..3c3ba5622ad
--- /dev/null
+++ b/spec/factories/work_item/work_item_types.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :work_item_type, class: 'WorkItem::Type' do
+    group
+
+    name      { generate(:work_item_type_name) }
+    icon_name { 'issue' }
+    base_type { Issue.issue_types['issue'] }
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index e32fea6c5e7..36eb1c04c81 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -7,6 +7,7 @@ issues:
 - updated_by
 - milestone
 - iteration
+- work_item_type
 - notes
 - resource_label_events
 - resource_weight_events
@@ -56,6 +57,8 @@ issues:
 - issue_email_participants
 - test_reports
 - requirement
+work_item_type:
+- issues
 events:
 - author
 - project
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 9ce96e7d015..26d2a05c54f 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -15,6 +15,7 @@ RSpec.describe Issue do
     it { is_expected.to belong_to(:iteration) }
     it { is_expected.to belong_to(:project) }
     it { is_expected.to have_one(:namespace).through(:project) }
+    it { is_expected.to belong_to(:work_item_type).class_name('WorkItem::Type') }
     it { is_expected.to belong_to(:moved_to).class_name('Issue') }
     it { is_expected.to have_one(:moved_from).class_name('Issue') }
     it { is_expected.to belong_to(:duplicated_to).class_name('Issue') }
diff --git a/spec/models/work_item/type_spec.rb b/spec/models/work_item/type_spec.rb
new file mode 100644
index 00000000000..e344c4610bd
--- /dev/null
+++ b/spec/models/work_item/type_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe WorkItem::Type do
+  describe 'modules' do
+    it { is_expected.to include_module(CacheMarkdownField) }
+  end
+
+  describe 'associations' do
+    it { is_expected.to have_many(:work_items).with_foreign_key('work_item_type_id') }
+    it { is_expected.to belong_to(:group).with_foreign_key('namespace_id') }
+  end
+
+  describe '#destroy' do
+    let!(:work_item) { create :issue }
+
+    context 'when there are no work items of that type' do
+      it 'deletes type but not unrelated issues' do
+        type = create(:work_item_type)
+
+        expect { type.destroy! }.not_to change(Issue, :count)
+        expect(WorkItem::Type.count).to eq 0
+      end
+    end
+
+    it 'does not delete type when there are related issues' do
+      type = create(:work_item_type, work_items: [work_item])
+
+      expect { type.destroy! }.to raise_error(ActiveRecord::InvalidForeignKey)
+      expect(Issue.count).to eq 1
+    end
+  end
+
+  describe 'validation' do
+    describe 'name uniqueness' do
+      subject { create(:work_item_type) }
+
+      it { is_expected.to validate_uniqueness_of(:name).case_insensitive.scoped_to([:namespace_id]) }
+    end
+
+    it { is_expected.not_to allow_value('s' * 256).for(:icon_name) }
+  end
+
+  describe '#name' do
+    it 'strips name' do
+      work_item_type = described_class.new(name: '   label😸   ')
+      work_item_type.valid?
+
+      expect(work_item_type.name).to eq('label😸')
+    end
+  end
+end