Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -402,7 +402,9 @@ export default {
             :text="currentEnvironmentName"
           >
             <div class="d-flex flex-column overflow-hidden">
-              <gl-dropdown-header class="text-center">{{ __('Environment') }}</gl-dropdown-header>
+              <gl-dropdown-header class="monitor-environment-dropdown-header text-center">{{
+                __('Environment')
+              }}</gl-dropdown-header>
               <gl-dropdown-divider />
               <gl-search-box-by-type
                 v-if="shouldRenderSearchableEnvironmentsDropdown"

app/assets/javascripts/monitoring/components/dashboards_dropdown.vue

@@ -4,11 +4,14 @@ import {
   GlAlert,
   GlDropdown,
   GlDropdownItem,
+  GlDropdownHeader,
   GlDropdownDivider,
+  GlSearchBoxByType,
   GlModal,
   GlLoadingIcon,
   GlModalDirective,
 } from '@gitlab/ui';
+import { s__ } from '~/locale';
 import DuplicateDashboardForm from './duplicate_dashboard_form.vue';
 const events = {
@@ -20,7 +23,9 @@ export default {
     GlAlert,
     GlDropdown,
     GlDropdownItem,
+    GlDropdownHeader,
     GlDropdownDivider,
+    GlSearchBoxByType,
     GlModal,
     GlLoadingIcon,
     DuplicateDashboardForm,
@@ -44,6 +49,7 @@ export default {
       alert: null,
       loading: false,
       form: {},
+      searchTerm: '',
     };
   },
   computed: {
@@ -54,6 +60,17 @@ export default {
     selectedDashboardText() {
       return this.selectedDashboard.display_name;
     },
+    filteredDashboards() {
+      return this.allDashboards.filter(({ display_name }) =>
+        display_name.toLowerCase().includes(this.searchTerm.toLowerCase()),
+      );
+    },
+    shouldShowNoMsgContainer() {
+      return this.filteredDashboards.length === 0;
+    },
+    okButtonText() {
+      return this.loading ? s__('Metrics|Duplicating...') : s__('Metrics|Duplicate');
+    },
   },
   methods: {
     ...mapActions('monitoringDashboard', ['duplicateSystemDashboard']),
@@ -95,45 +112,70 @@ export default {
 };
 </script>
 <template>
-  <gl-dropdown toggle-class="dropdown-menu-toggle" :text="selectedDashboardText">
-    <gl-dropdown-item
-      v-for="dashboard in allDashboards"
-      :key="dashboard.path"
-      :active="dashboard.path === selectedDashboard.path"
-      active-class="is-active"
-      @click="selectDashboard(dashboard)"
-    >
-      {{ dashboard.display_name || dashboard.path }}
-    </gl-dropdown-item>
-
-    <template v-if="isSystemDashboard">
+  <gl-dropdown
+    toggle-class="dropdown-menu-toggle"
+    menu-class="monitor-dashboard-dropdown-menu"
+    :text="selectedDashboardText"
+  >
+    <div class="d-flex flex-column overflow-hidden">
+      <gl-dropdown-header class="monitor-dashboard-dropdown-header text-center">{{
+        __('Dashboard')
+      }}</gl-dropdown-header>
       <gl-dropdown-divider />
-      <gl-modal
-        ref="duplicateDashboardModal"
-        modal-id="duplicateDashboardModal"
-        :title="s__('Metrics|Duplicate dashboard')"
-        ok-variant="success"
-        @ok="ok"
-        @hide="hide"
+      <gl-search-box-by-type
+        ref="monitorDashboardsDropdownSearch"
+        v-model="searchTerm"
+        class="m-2"
+      />
+      <div class="flex-fill overflow-auto">
+        <gl-dropdown-item
+          v-for="dashboard in filteredDashboards"
+          :key="dashboard.path"
+          :active="dashboard.path === selectedDashboard.path"
+          active-class="is-active"
+          @click="selectDashboard(dashboard)"
+        >
+          {{ dashboard.display_name || dashboard.path }}
+        </gl-dropdown-item>
+      </div>
+      <div
+        v-show="shouldShowNoMsgContainer"
+        ref="monitorDashboardsDropdownMsg"
+        class="text-secondary no-matches-message"
       >
-        <gl-alert v-if="alert" class="mb-3" variant="danger" @dismiss="alert = null">
-          {{ alert }}
-        </gl-alert>
-        <duplicate-dashboard-form
-          :dashboard="selectedDashboard"
-          :default-branch="defaultBranch"
-          @change="formChange"
-        />
-        <template #modal-ok>
-          <gl-loading-icon v-if="loading" inline color="light" />
-          {{ loading ? s__('Metrics|Duplicating...') : s__('Metrics|Duplicate') }}
-        </template>
-      </gl-modal>
-      <gl-dropdown-item ref="duplicateDashboardItem" v-gl-modal="'duplicateDashboardModal'">
-        {{ s__('Metrics|Duplicate dashboard') }}
-      </gl-dropdown-item>
-    </template>
+        {{ __('No matching results') }}
+      </div>
+
+      <template v-if="isSystemDashboard">
+        <gl-dropdown-divider />
+
+        <gl-modal
+          ref="duplicateDashboardModal"
+          modal-id="duplicateDashboardModal"
+          :title="s__('Metrics|Duplicate dashboard')"
+          ok-variant="success"
+          @ok="ok"
+          @hide="hide"
+        >
+          <gl-alert v-if="alert" class="mb-3" variant="danger" @dismiss="alert = null">
+            {{ alert }}
+          </gl-alert>
+          <duplicate-dashboard-form
+            :dashboard="selectedDashboard"
+            :default-branch="defaultBranch"
+            @change="formChange"
+          />
+          <template #modal-ok>
+            <gl-loading-icon v-if="loading" inline color="light" />
+            {{ okButtonText }}
+          </template>
+        </gl-modal>
+        <gl-dropdown-item ref="duplicateDashboardItem" v-gl-modal="'duplicateDashboardModal'">
+          {{ s__('Metrics|Duplicate dashboard') }}
+        </gl-dropdown-item>
+      </template>
+    </div>
   </gl-dropdown>
 </template>

app/assets/javascripts/mr_popover/constants.js

@@ -3,6 +3,7 @@ import { __ } from '~/locale';
 export const mrStates = {
   merged: 'merged',
   closed: 'closed',
+  open: 'open',
 };
 export const humanMRStates = {

app/assets/javascripts/registry/settings/components/settings_form.vue

 <script>
-import { mapActions, mapState } from 'vuex';
+import { mapActions, mapState, mapGetters } from 'vuex';
 import {
   GlFormGroup,
   GlToggle,
@@ -42,6 +42,7 @@ export default {
   },
   computed: {
     ...mapState(['formOptions', 'isLoading']),
+    ...mapGetters({ isEdited: 'getIsEdited' }),
     ...mapComputed(
       [
         'enabled',
@@ -92,6 +93,9 @@ export default {
     isSubmitButtonDisabled() {
       return this.formIsInvalid || this.isLoading;
     },
+    isCancelButtonDisabled() {
+      return !this.isEdited || this.isLoading;
+    },
   },
   methods: {
     ...mapActions(['resetSettings', 'saveSettings']),
@@ -211,7 +215,12 @@ export default {
       </template>
       <template #footer>
         <div class="d-flex justify-content-end">
-          <gl-button ref="cancel-button" type="reset" class="mr-2 d-block" :disabled="isLoading">
+          <gl-button
+            ref="cancel-button"
+            type="reset"
+            :disabled="isCancelButtonDisabled"
+            class="mr-2 d-block"
+          >
             {{ __('Cancel') }}
           </gl-button>
           <gl-button

app/assets/javascripts/registry/settings/store/getters.js

+import { isEqual } from 'lodash';
 import { findDefaultOption } from '../utils';
 export const getCadence = state =>
@@ -6,3 +7,4 @@ export const getKeepN = state =>
   state.settings.keep_n || findDefaultOption(state.formOptions.keepN);
 export const getOlderThan = state =>
   state.settings.older_than || findDefaultOption(state.formOptions.olderThan);
+export const getIsEdited = state => !isEqual(state.original, state.settings);

app/assets/javascripts/vue_alerts.js

+import Vue from 'vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
+import DismissibleAlert from '~/vue_shared/components/dismissible_alert.vue';
+
+const mountVueAlert = el => {
+  const props = {
+    html: el.innerHTML,
+  };
+  const attrs = {
+    ...el.dataset,
+    dismissible: parseBoolean(el.dataset.dismissible),
+  };
+
+  return new Vue({
+    el,
+    render(h) {
+      return h(DismissibleAlert, { props, attrs });
+    },
+  });
+};
+
+export default () => [...document.querySelectorAll('.js-vue-alert')].map(mountVueAlert);

app/assets/javascripts/vue_shared/components/dismissible_alert.vue

+<script>
+import { GlAlert } from '@gitlab/ui';
+
+export default {
+  components: {
+    GlAlert,
+  },
+  props: {
+    html: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      isDismissed: false,
+    };
+  },
+  methods: {
+    dismiss() {
+      this.isDismissed = true;
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-alert v-if="!isDismissed" v-bind="$attrs" @dismiss="dismiss" v-on="$listeners">
+    <div v-html="html"></div>
+  </gl-alert>
+</template>

app/assets/stylesheets/pages/prometheus.scss

@@ -47,7 +47,12 @@
 }
 .prometheus-graphs-header {
-  .monitor-environment-dropdown-menu {
+  .monitor-dashboard-dropdown-header header {
+    font-size: $gl-font-size;
+  }
+
+  .monitor-environment-dropdown-menu,
+  .monitor-dashboard-dropdown-menu {
     &.show {
       display: flex;
       flex-direction: column;

app/helpers/analytics_navbar_helper.rb

@@ -20,6 +20,10 @@ module AnalyticsNavbarHelper
     ].compact
   end
+  def group_analytics_navbar_links(group, current_user)
+    []
+  end
+
   private
   def navbar_sub_item(args)

app/helpers/groups_helper.rb

@@ -7,7 +7,6 @@ module GroupsHelper
       groups#details
       groups#activity
       groups#subgroups
-      analytics#show
     ]
   end

app/views/layouts/nav/sidebar/_project_analytics_link.html.haml → app/views/layouts/nav/sidebar/_analytics_links.html.haml

-- navbar_sub_item = project_analytics_navbar_links(@project, current_user).sort_by(&:title)
-- all_paths = navbar_sub_item.map(&:path)
-- if navbar_sub_item.any?
+- navbar_links = links.sort_by(&:title)
+- all_paths = navbar_links.map(&:path)
+- if navbar_links.any?
   = nav_link(path: all_paths) do
-    = link_to navbar_sub_item.first.link, data: { qa_selector: 'project_analytics_link' } do
+    = link_to navbar_links.first.link do
       .nav-icon-container
         = sprite_icon('chart')
       %span.nav-item-name
         = _('Analytics')
     %ul.sidebar-sub-level-items
-      - navbar_sub_item.each do |menu_item|
+      - navbar_links.each do |menu_item|
         = nav_link(path: menu_item.path) do
           = link_to(menu_item.link, menu_item.link_to_options) do
             %span= menu_item.title

app/views/layouts/nav/sidebar/_group.html.haml

+- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_group_analytics_sidebar, @group)
 - issues_count = group_issues_count(state: 'opened')
 - merge_requests_count = group_merge_requests_count(state: 'opened')
@@ -11,7 +12,9 @@
           = @group.name
     %ul.sidebar-top-level-items.qa-group-sidebar
       - if group_sidebar_link?(:overview)
-        = nav_link(path: group_overview_nav_link_paths, html_options: { class: 'home' }) do
+        - paths = group_overview_nav_link_paths
+        - paths << 'contribution_analytics#show' unless should_display_analytics_pages_in_sidebar
+        = nav_link(path: paths, unless: -> { should_display_analytics_pages_in_sidebar && current_path?('groups/contribution_analytics#show') }, html_options: { class: 'home' }) do
           = link_to group_path(@group) do
             .nav-icon-container
               = sprite_icon('home')
@@ -42,18 +45,19 @@
                   %span
                     = _('Activity')
-            - if group_sidebar_link?(:contribution_analytics)
-              = nav_link(path: 'analytics#show') do
-                = link_to group_contribution_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right', qa_selector: 'contribution_analytics_link' } do
-                  %span
-                    = _('Contribution Analytics')
-            = render_if_exists 'layouts/nav/group_insights_link'
+            - unless should_display_analytics_pages_in_sidebar
+              - if group_sidebar_link?(:contribution_analytics)
+                = nav_link(path: 'contribution_analytics#show') do
+                  = link_to group_contribution_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right', qa_selector: 'contribution_analytics_link' } do
+                    %span
+                      = _('Contribution Analytics')
+              = render_if_exists 'layouts/nav/group_insights_link'
       = render_if_exists "layouts/nav/ee/epic_link", group: @group
       - if group_sidebar_link?(:issues)
-        = nav_link(path: group_issues_sub_menu_items) do
+        = nav_link(path: group_issues_sub_menu_items, unless: -> { should_display_analytics_pages_in_sidebar && current_path?('issues_analytics#show') }) do
           = link_to issues_group_path(@group), data: { qa_selector: 'group_issues_item' } do
             .nav-icon-container
               = sprite_icon('issues')
@@ -80,7 +84,8 @@
                   %span
                     = boards_link_text
-            = render_if_exists 'layouts/nav/issues_analytics_link'
+            - unless should_display_analytics_pages_in_sidebar
+              = render_if_exists 'layouts/nav/issues_analytics_link'
             - if group_sidebar_link?(:labels)
               = nav_link(path: 'labels#index') do
@@ -126,6 +131,8 @@
       = render_if_exists 'groups/sidebar/packages'
+      = render 'layouts/nav/sidebar/analytics_links', links: group_analytics_navbar_links(@group, current_user)
+
       - if group_sidebar_link?(:group_members)
         = nav_link(path: 'group_members#index') do
           = link_to group_group_members_path(@group) do

app/views/layouts/nav/sidebar/_project.html.haml

@@ -298,7 +298,7 @@
       = render_if_exists 'layouts/nav/sidebar/project_packages_link'
-      = render 'layouts/nav/sidebar/project_analytics_link'
+      = render 'layouts/nav/sidebar/analytics_links', links: project_analytics_navbar_links(@project, current_user)
       - if project_nav_tab? :wiki
         - wiki_url = project_wiki_path(@project, :home)

changelogs/unreleased/35288-update-metrics-dashboard-dropdowns.yml

+---
+title: Added search box to dashboards dropdown in monitoring dashboard
+merge_request: 23906
+author:
+type: added

changelogs/unreleased/improvement-outdated-security-report.yml

+---
+title: Show security report outdated message for only Active MRs
+merge_request: 23575
+author:
+type: other

changelogs/unreleased/refactoring-entities-file-6.yml

+---
+title: Separate project and group entities into own class files
+merge_request: 24070
+author: Rajendra Kadam
+type: added

doc/administration/packages/container_registry.md

@@ -346,7 +346,7 @@ The default location where images are stored in source installations, is
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.
-## Container Registry storage driver
+### Container Registry storage driver
 You can configure the Container Registry to use a different storage backend by
 configuring a different storage driver. By default the GitLab Container Registry
@@ -425,6 +425,12 @@ storage:
 NOTE: **Note:**
 `your-s3-bucket` should only be the name of a bucket that exists, and can't include subdirectories.
+### Storage limitations
+
+Currently, there is no storage limitation, which means a user can upload an
+infinite amount of Docker images with arbitrary sizes. This setting will be
+configurable in future releases.
+
 ## Change the registry's internal port
 NOTE: **Note:**
@@ -536,12 +542,6 @@ You can use GitLab as an auth endpoint with an external container registry.
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.
-## Storage limitations
-
-Currently, there is no storage limitation, which means a user can upload an
-infinite amount of Docker images with arbitrary sizes. This setting will be
-configurable in future releases.
-
 ## Configure Container Registry notifications
 You can configure the Container Registry to send webhook notifications in
@@ -595,6 +595,193 @@ notifications:
       backoff: 1000
 ```
+## Container Registry garbage collection
+
+NOTE: **Note:**
+The garbage collection tools are only available when you've installed GitLab
+via an Omnibus package or the cloud native chart.
+
+Container Registry can use considerable amounts of disk space. To clear up
+some unused layers, the registry includes a garbage collect command.
+
+GitLab offers a set of APIs to manipulate the Container Registry and aid the process
+of removing unused tags. Currently, this is exposed using the API, but in the future,
+these controls will be migrated to the GitLab interface.
+
+Project maintainers can
+[delete Container Registry tags in bulk](../../api/container_registry.md#delete-repository-tags-in-bulk)
+periodically based on their own criteria, however, this alone does not recycle data,
+it only unlinks tags from manifests and image blobs. To recycle the Container
+Registry data in the whole GitLab instance, you can use the built-in command
+provided by `gitlab-ctl`.
+
+### Understanding the content-addressable layers
+
+Consider the following example, where you first build the image:
+
+```bash
+# This builds a image with content of sha256:111111
+docker build -t my.registry.com/my.group/my.project:latest .
+docker push my.registry.com/my.group/my.project:latest
+```
+
+Now, you do overwrite `:latest` with a new version:
+
+```bash
+# This builds a image with content of sha256:222222
+docker build -t my.registry.com/my.group/my.project:latest .
+docker push my.registry.com/my.group/my.project:latest
+```
+
+Now, the `:latest` tag points to manifest of `sha256:222222`. However, due to
+the architecture of registry, this data is still accessible when pulling the
+image `my.registry.com/my.group/my.project@sha256:111111`, even though it is
+no longer directly accessible via the `:latest` tag.
+
+### Recycling unused tags
+
+There are a couple of considerations you need to note before running the
+built-in command:
+
+- The built-in command will stop the registry before it starts the garbage collection.
+- The garbage collect command takes some time to complete, depending on the
+  amount of data that exists.
+- If you changed the location of registry configuration file, you will need to
+  specify its path.
+- After the garbage collection is done, the registry should start up automatically.
+
+DANGER: **Danger:**
+By running the built-in garbage collection command, it will cause downtime to
+the Container Registry. Running this command on an instance in an HA environment
+while one of your other instances is still writing to the Registry storage,
+will remove referenced manifests. To avoid that, make sure Registry is set to
+[read-only mode](#performing-garbage-collection-without-downtime) before proceeding.
+
+If you did not change the default location of the configuration file, run:
+
+```sh
+sudo gitlab-ctl registry-garbage-collect
+```
+
+This command will take some time to complete, depending on the amount of
+layers you have stored.
+
+If you changed the location of the Container Registry `config.yml`:
+
+```sh
+sudo gitlab-ctl registry-garbage-collect /path/to/config.yml
+```
+
+You may also [remove all unreferenced manifests](#removing-unused-layers-not-referenced-by-manifests),
+although this is a way more destructive operation, and you should first
+understand the implications.
+
+### Removing unused layers not referenced by manifests
+
+> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3097) in Omnibus GitLab 11.10.
+
+DANGER: **Danger:**
+This is a destructive operation.
+
+The GitLab Container Registry follows the same default workflow as Docker Distribution:
+retain all layers, even ones that are unreferenced directly to allow all content
+to be accessed using context addressable identifiers.
+
+However, in most workflows, you don't care about old layers if they are not directly
+referenced by the registry tag. The `registry-garbage-collect` command supports the
+`-m` switch to allow you to remove all unreferenced manifests and layers that are
+not directly accessible via `tag`:
+
+```sh
+sudo gitlab-ctl registry-garbage-collect -m
+```
+
+Since this is a way more destructive operation, this behavior is disabled by default.
+You are likely expecting this way of operation, but before doing that, ensure
+that you have backed up all registry data.
+
+### Performing garbage collection without downtime
+
+You can perform a garbage collection without stopping the Container Registry by setting
+it into a read-only mode and by not using the built-in command. During this time,
+you will be able to pull from the Container Registry, but you will not be able to
+push.
+
+NOTE: **Note:**
+By default, the [registry storage path](#container-registry-storage-path)
+is `/var/opt/gitlab/gitlab-rails/shared/registry`.
+
+To enable the read-only mode:
+
+1. In `/etc/gitlab/gitlab.rb`, specify the read-only mode:
+
+   ```ruby
+     registry['storage'] = {
+       'filesystem' => {
+         'rootdirectory' => "<your_registry_storage_path>"
+       },
+       'maintenance' => {
+         'readonly' => {
+           'enabled' => true
+         }
+       }
+     }
+   ```
+
+1. Save and reconfigure GitLab:
+
+   ```sh
+   sudo gitlab-ctl reconfigure
+   ```
+
+   This will set the Container Registry into the read only mode.
+
+1. Next, trigger the garbage collect command:
+
+   ```sh
+   sudo /opt/gitlab/embedded/bin/registry garbage-collect /var/opt/gitlab/registry/config.yml
+   ```
+
+   This will start the garbage collection, which might take some time to complete.
+
+1. Once done, in `/etc/gitlab/gitlab.rb` change it back to read-write mode:
+
+   ```ruby
+    registry['storage'] = {
+      'filesystem' => {
+        'rootdirectory' => "<your_registry_storage_path>"
+      },
+      'maintenance' => {
+        'readonly' => {
+          'enabled' => false
+        }
+      }
+    }
+   ```
+
+1. Save and reconfigure GitLab:
+
+   ```sh
+   sudo gitlab-ctl reconfigure
+   ```
+
+### Running the garbage collection on schedule
+
+Ideally, you want to run the garbage collection of the registry regularly on a
+weekly basis at a time when the registry is not being in-use.
+The simplest way is to add a new crontab job that it will run periodically
+once a week.
+
+Create a file under `/etc/cron.d/registry-garbage-collect`:
+
+```bash
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+# Run every Sunday at 04:05am
+5 4 * * 0  root gitlab-ctl registry-garbage-collect
+```
+
 ## Troubleshooting
 Before diving in to the following sections, here's some basic troubleshooting:

doc/api/groups.md

@@ -118,7 +118,7 @@ Parameters:
 | ------------------------ | ----------------- | -------- | ----------- |
 | `id`                     | integer/string    | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) of the parent group |
 | `skip_groups`            | array of integers | no       | Skip the group IDs passed |
-| `all_available`          | boolean           | no       | Show all the groups you have access to (defaults to `false` for authenticated users, `true` for admin); Attributes `owned` and `min_access_level` have preceden |
+| `all_available`          | boolean           | no       | Show all the groups you have access to (defaults to `false` for authenticated users, `true` for admin); Attributes `owned` and `min_access_level` have precedence |
 | `search`                 | string            | no       | Return the list of authorized groups matching the search criteria |
 | `order_by`               | string            | no       | Order groups by `name`, `path` or `id`. Default is `name` |
 | `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc` |

doc/api/pages.md

@@ -6,7 +6,7 @@ The GitLab Pages feature must be enabled to use these endpoints. Find out more a
 ## Unpublish pages
-Remove pages. The user must have admin priviledges.
+Remove pages. The user must have admin privileges.
 ```text
 DELETE /projects/:id/pages

doc/api/projects.md

@@ -2117,7 +2117,7 @@ POST /projects/:id/push_rule
 | `commit_message_negative_regex` **(STARTER)** | string         | no       | No commit message is allowed to match this, e.g. `ssh\:\/\/` |
 | `branch_name_regex` **(STARTER)**             | string         | no       | All branch names must match this, e.g. `(feature|hotfix)\/*` |
 | `author_email_regex` **(STARTER)**            | string         | no       | All commit author emails must match this, e.g. `@my-company.com$` |
-| `file_name_regex` **(STARTER)**               | string         | no       | All commited filenames must **not** match this, e.g. `(jar|exe)$` |
+| `file_name_regex` **(STARTER)**               | string         | no       | All committed filenames must **not** match this, e.g. `(jar|exe)$` |
 | `max_file_size` **(STARTER)**                 | integer        | no       | Maximum file size (MB) |
 | `commit_committer_check` **(PREMIUM)**        | boolean        | no       | Users can only push commits to this repository that were committed with one of their own verified emails. |
 | `reject_unsigned_commits` **(PREMIUM)**        | boolean        | no       | Reject commit when it is not signed through GPG. |
@@ -2140,7 +2140,7 @@ PUT /projects/:id/push_rule
 | `commit_message_negative_regex` **(STARTER)** | string         | no       | No commit message is allowed to match this, e.g. `ssh\:\/\/` |
 | `branch_name_regex` **(STARTER)**             | string         | no       | All branch names must match this, e.g. `(feature|hotfix)\/*` |
 | `author_email_regex` **(STARTER)**            | string         | no       | All commit author emails must match this, e.g. `@my-company.com$` |
-| `file_name_regex` **(STARTER)**               | string         | no       | All commited filenames must **not** match this, e.g. `(jar|exe)$` |
+| `file_name_regex` **(STARTER)**               | string         | no       | All committed filenames must **not** match this, e.g. `(jar|exe)$` |
 | `max_file_size` **(STARTER)**                 | integer        | no       | Maximum file size (MB) |
 | `commit_committer_check` **(PREMIUM)**        | boolean        | no       | Users can only push commits to this repository that were committed with one of their own verified emails. |
 | `reject_unsigned_commits` **(PREMIUM)**        | boolean        | no       | Reject commits when they are not GPG signed. |