-
- Downloads
Fix specs
- Add match line header to expected result for `File#sections`. - Lowercase CSS colours. - Remove unused `diff_refs` keyword argument. - Rename `parent` -> `parent_file`, to be more explicit. - Skip an iteration when highlighting.
Showing
- app/assets/stylesheets/pages/merge_conflicts.scss 12 additions, 12 deletionsapp/assets/stylesheets/pages/merge_conflicts.scss
- lib/gitlab/conflict/file.rb 7 additions, 11 deletionslib/gitlab/conflict/file.rb
- lib/gitlab/conflict/file_collection.rb 0 additions, 1 deletionlib/gitlab/conflict/file_collection.rb
- lib/gitlab/conflict/parser.rb 3 additions, 3 deletionslib/gitlab/conflict/parser.rb
- lib/gitlab/diff/line.rb 3 additions, 3 deletionslib/gitlab/diff/line.rb
- spec/lib/gitlab/conflict/file_spec.rb 2 additions, 3 deletionsspec/lib/gitlab/conflict/file_spec.rb
Loading
Please register or sign in to comment