Stan Hu
ae3f869fd1
Fix the "Reload with full diff" URL button
...
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.
Closes #2041
2015-07-23 12:53:54 -07:00
Sytse Sijbrandij
5ee8ae4894
Detail too many warning to explain that merge will still work.
2015-07-06 22:03:36 +02:00
Alex Lossent
affd049dc4
Improve handling of large diffs
...
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.
https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8 , e0eb4803 and c741fcab .
This patch re-introduces a safe limit on number of lines.
2015-05-05 18:51:12 +02:00
Dmitriy Zaporozhets
30ca451fd4
Refactor buttons
2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets
3bfd53149c
Replace bs-callout with alert
2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets
1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
Vinnie Okada
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Sytse Sijbrandij
ee804e2d94
Better English in the performance diff message.
2015-02-14 12:13:31 -08:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets
02e87d9223
optimize show_diff_size_warning?
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 22:12:54 +03:00
Dmitriy Zaporozhets
218219abbd
Refactoring inside refactoring. We need to go deeper
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00