diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-02 15:28:17 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-02 15:28:17 +0100 |
| commit | f461de24dff1d1a1b877fbe6ab45aa71e3f3f32d (patch) | |
| tree | 453b6bde71e9e800dd57bcb72853ee8c485893a8 /lib/gitlab/diff/file_collection/base.rb | |
| parent | 4a8a59c857c34a46fb7e0f1d61171ae8bd2c9b37 (diff) | |
| parent | dab266219441144a74b86fa27f4e0528810482d1 (diff) | |
| download | gitlab-ce-job-details-increase-deboune.tar.gz | |
Merge branch 'master' into job-details-increase-debounejob-details-increase-deboune
* master: (273 commits)
Pipeline show view real time header section
Minor refactor based on review feedback
Address review comments
Show current user immediately in issuable filters
Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`
Add new Rake task to simplify the compilation of PO files
Fix race condition between pipeline creation and MR diff_head_sha update
Resolve "Improve Container Registry description"
Allow admins to delete users from the admin users page
Add username parameter to gravatar URL
Explicitly test etag cache invalidation
Fix replying to a commit discussion displayed in the context of an MR
Add fog-aliyun as backup storage provider
Add missing specs
Make sure protected can't be null; Test protected!
Update session cookie key name to be unique to instance in development
Just mention which GitLab version is required
Fix data inconsistency issue for old artifacts by moving them to a currently used path
Fix N+1 queries for non-members in comment threads
Fix rubocop in spec/helpers/diff_helper_spec.rb
...
Diffstat (limited to 'lib/gitlab/diff/file_collection/base.rb')
| -rw-r--r-- | lib/gitlab/diff/file_collection/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb index 79836a2fbab..a6007ebf531 100644 --- a/lib/gitlab/diff/file_collection/base.rb +++ b/lib/gitlab/diff/file_collection/base.rb @@ -7,7 +7,7 @@ module Gitlab delegate :count, :size, :real_size, to: :diff_files def self.default_options - ::Commit.max_diff_options.merge(ignore_whitespace_change: false, no_collapse: false) + ::Commit.max_diff_options.merge(ignore_whitespace_change: false, expanded: false) end def initialize(diffable, project:, diff_options: nil, diff_refs: nil, fallback_diff_refs: nil) |