Commit 95d2264f authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'stanhu/gitlab-ee-fix-force-load-large-diff' into 'master'

Fix "Reload with full diff" button not working

Closes #431

Supersedes !312 so that tests can pass...

See merge request !313
parents cb7c9698 564e8564
...@@ -5,6 +5,7 @@ v 8.7.0 (unreleased) ...@@ -5,6 +5,7 @@ v 8.7.0 (unreleased)
- Refactor group sync to pull access level logic to its own class. !306 - Refactor group sync to pull access level logic to its own class. !306
v 8.6.3 (unreleased) v 8.6.3 (unreleased)
- Fix "Reload with full diff" button not working (Stan Hu)
- Exit ElasticIndexerWorker's job happily if record cannot be found. !311 - Exit ElasticIndexerWorker's job happily if record cannot be found. !311
v 8.6.2 v 8.6.2
......
...@@ -50,10 +50,4 @@ module EmailsHelper ...@@ -50,10 +50,4 @@ module EmailsHelper
msg = "This link is valid for #{password_reset_token_valid_time}. " msg = "This link is valid for #{password_reset_token_valid_time}. "
msg << "After it expires, you can #{link_tag}." msg << "After it expires, you can #{link_tag}."
end end
# Overrides
def diff_hard_limit_enabled?
false
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment