diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 18:07:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 18:07:34 +0300 |
| commit | df9890e9a702e2f12bbc8f022b916ca72820a292 (patch) | |
| tree | 26ff255cfb6843fe963fcafea9ee70121ee5e913 /lib/gitlab/search | |
| parent | 17c1c66eefd05243dd8ed2c8fd49d17ab1a52522 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/search')
| -rw-r--r-- | lib/gitlab/search/found_blob.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/search/found_blob.rb b/lib/gitlab/search/found_blob.rb index 60d3e360984..79d6cfc84a3 100644 --- a/lib/gitlab/search/found_blob.rb +++ b/lib/gitlab/search/found_blob.rb @@ -9,7 +9,7 @@ module Gitlab include Gitlab::Utils::StrongMemoize include BlobActiveModel - attr_reader :project, :content_match, :blob_path, :highlight_line + attr_reader :project, :content_match, :blob_path, :highlight_line, :matched_lines_count PATH_REGEXP = /\A(?<ref>[^:]*):(?<path>[^\x00]*)\x00/.freeze CONTENT_REGEXP = /^(?<ref>[^:]*):(?<path>[^\x00]*)\x00(?<startline>\d+)\x00/.freeze @@ -25,6 +25,7 @@ module Gitlab @binary_path = opts.fetch(:path, nil) @binary_basename = opts.fetch(:basename, nil) @ref = opts.fetch(:ref, nil) + @matched_lines_count = opts.fetch(:matched_lines_count, nil) @startline = opts.fetch(:startline, nil) @highlight_line = opts.fetch(:highlight_line, nil) @binary_data = opts.fetch(:data, nil) |