diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 15:10:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 15:10:48 +0000 |
| commit | 232e7582b0e81e95bd721ad8094fcb50ecbc8a04 (patch) | |
| tree | a68e00760d0a3446c2030addd679b33acfa39d2d /.haml-lint_todo.yml | |
| parent | 980d813e90c70f09861e39b9269e73b2c9a4e936 (diff) | |
| download | gitlab-ce-232e7582b0e81e95bd721ad8094fcb50ecbc8a04.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.haml-lint_todo.yml')
| -rw-r--r-- | .haml-lint_todo.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index 5b92863b91e..bda203f30ac 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -216,8 +216,6 @@ linters: - 'app/views/projects/merge_requests/conflicts/_commit_stats.html.haml' - 'app/views/projects/merge_requests/conflicts/_file_actions.html.haml' - 'app/views/projects/merge_requests/conflicts/_submit_form.html.haml' - - 'app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml' - - 'app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml' - 'app/views/projects/merge_requests/conflicts/show.html.haml' - 'app/views/projects/merge_requests/creations/_diffs.html.haml' - 'app/views/projects/merge_requests/creations/_new_compare.html.haml' |