Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-01-20 00:09:03 +00:00
parent 6387405a06
commit 52ac2cacfd
2 changed files with 2 additions and 2 deletions

View File

@ -229,7 +229,7 @@ class Snippet < ApplicationRecord
(public? && (title_changed? || content_changed?))
end
# snippers are the biggest sources of spam
# snippets are the biggest sources of spam
override :allow_possible_spam?
def allow_possible_spam?
false

View File

@ -220,7 +220,7 @@ end
them non-nullable. These options can still be overridden by adding
them as arguments.
- **`ability_field`**: Expose an ability defined in our policies. This
takes behaves the same way as `permission_field` and the same
behaves the same way as `permission_field` and the same
arguments can be overridden.
- **`abilities`**: Allows exposing several abilities defined in our
policies at once. The fields for these will all have be non-nullable