summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-07-07 07:50:58 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-07-07 07:50:58 +0000
commitfaa535ecdf8890afdccb793e3ff5babedda2d0bb (patch)
tree0cc652268ff2ee8846235247107c32a5b69f42d7
parent17446ff0c98e870f0500279983432e5115e060a4 (diff)
parent5ee8ae4894fd39c404ae035c623217143ef42849 (diff)
downloadgitlab-ce-faa535ecdf8890afdccb793e3ff5babedda2d0bb.tar.gz
Merge branch 'detail-too-many-warning' into 'master'
Detail too many warning to explain that merge will still work. See merge request !1889
-rw-r--r--app/views/projects/diffs/_warning.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml
index bd0b7376ba7..da3d4be84ba 100644
--- a/app/views/projects/diffs/_warning.html.haml
+++ b/app/views/projects/diffs/_warning.html.haml
@@ -1,6 +1,6 @@
.alert.alert-warning
%h4
- Too many changes.
+ Too many changes to show.
.pull-right
- unless diff_hard_limit_enabled?
= link_to "Reload with full diff", url_for(params.merge(force_show_diff: true)), class: "btn btn-sm btn-warning"