Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
5ee8ae48
Commit
5ee8ae48
authored
Jul 06, 2015
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Detail too many warning to explain that merge will still work.
parent
17446ff0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/projects/diffs/_warning.html.haml
app/views/projects/diffs/_warning.html.haml
+1
-1
No files found.
app/views/projects/diffs/_warning.html.haml
View file @
5ee8ae48
.alert.alert-warning
.alert.alert-warning
%h4
%h4
Too many changes.
Too many changes
to show
.
.pull-right
.pull-right
-
unless
diff_hard_limit_enabled?
-
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"
=
link_to
"Reload with full diff"
,
url_for
(
params
.
merge
(
force_show_diff:
true
)),
class:
"btn btn-sm btn-warning"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment