Commit 1ba750af authored by Douwe Maan's avatar Douwe Maan

Merge branch 'git-doc-fix' into 'master'

[ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flags

See merge request gitlab-org/gitlab-ce!22434
parents 7ffe5742 c8ffd8b0
...@@ -72,7 +72,7 @@ module Gitlab ...@@ -72,7 +72,7 @@ module Gitlab
# and `safe_max_bytes` # and `safe_max_bytes`
# #
# :expanded :: # :expanded ::
# If true, patch raw data will not be included in the diff after # If false, patch raw data will not be included in the diff after
# `max_files`, `max_lines` or any of the limits in `limits` are # `max_files`, `max_lines` or any of the limits in `limits` are
# exceeded # exceeded
def filter_diff_options(options, default_options = {}) def filter_diff_options(options, default_options = {})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment