diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-02 09:20:22 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:46 +0300 |
| commit | 261d47bce9d7cc80b4c2068cb612411fe51530ee (patch) | |
| tree | 2f913169220c9e9e6d4e5e1610b085dedbdf864e /lib/gitlab/conflict/file_collection.rb | |
| parent | 6f3501fe252404b342984514b1b784ffa73edbd0 (diff) | |
| download | gitlab-ce-261d47bce9d7cc80b4c2068cb612411fe51530ee.tar.gz | |
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.
Diffstat (limited to 'lib/gitlab/conflict/file_collection.rb')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 5122a5b2111..da9994a7405 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -46,7 +46,6 @@ module Gitlab Gitlab::Conflict::File.new(merge_index.merge_file(conflict[:ours][:path]), conflict, - diff_refs: merge_request.diff_refs, repository: repository) end end |