Skip to content
代码片段 群组 项目
未验证 提交 efe2fd35 编辑于 作者: Lucas Charles's avatar Lucas Charles 提交者: GitLab
浏览文件

Merge branch 'improved-patch-file-filtering' into 'master'

Improve patched file filtering: exclude /bin/ and loosen structure.sql

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183199



Merged-by: default avatarLucas Charles <me@lucascharles.me>
Approved-by: default avatarLucas Charles <me@lucascharles.me>
Reviewed-by: default avatarLee Tickett <ltickett@gitlab.com>
Co-authored-by: default avatarLee Tickett <ltickett@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
...@@ -38,8 +38,9 @@ def patched_files ...@@ -38,8 +38,9 @@ def patched_files
def take_lines(string, lines) def take_lines(string, lines)
string.each_line.reject do |line| string.each_line.reject do |line|
line.ends_with?("/db/structure.sql\n") || line.ends_with?("/structure.sql\n") ||
line.include?('/lib/ruby/gems/') line.include?('/lib/ruby/gems/') ||
line.include?('/bin/')
end.first(lines).join end.first(lines).join
end end
end end
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
S.5....T. /opt/gitlab/embedded/cookbooks/gitlab-pages/libraries/gitlab_pages.rb S.5....T. /opt/gitlab/embedded/cookbooks/gitlab-pages/libraries/gitlab_pages.rb
..?...... /opt/gitlab/embedded/lib/ruby/gems/3.2.0/gems/ruby-fogbugz-0.3.0/.codeclimate.yml ..?...... /opt/gitlab/embedded/lib/ruby/gems/3.2.0/gems/ruby-fogbugz-0.3.0/.codeclimate.yml
S.5....T. /opt/gitlab/embedded/service/gitlab-rails/app/views/projects/issues/_details_content.html.haml S.5....T. /opt/gitlab/embedded/service/gitlab-rails/app/views/projects/issues/_details_content.html.haml
.....U... /opt/gitlab/embedded/service/gitlab-rails/db/structure.sql .....U... /opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/structure.sql
....L.... /opt/gitlab/embedded/bin/pg_ctl
OUTPUT OUTPUT
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册