summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-10-17 20:51:26 +0000
committerDouwe Maan <douwe@gitlab.com>2018-10-17 20:51:26 +0000
commit1ba750af5f7bfebb40b788ab03cda0e40be8c81d (patch)
tree4293208d2688e288a744c8a666bb9117dec1727c
parent7ffe5742af1bd6dcf3846ed7fc0607b72f684eb2 (diff)
parentc8ffd8b035f696799645ecc2aa990b02c5e39d75 (diff)
downloadgitlab-ce-1ba750af5f7bfebb40b788ab03cda0e40be8c81d.tar.gz
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
-rw-r--r--lib/gitlab/git/diff.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb
index 0d96211f4d4..b2e2d49dd0b 100644
--- a/lib/gitlab/git/diff.rb
+++ b/lib/gitlab/git/diff.rb
@@ -72,7 +72,7 @@ module Gitlab
# and `safe_max_bytes`
#
# :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
# exceeded
def filter_diff_options(options, default_options = {})