6f9f4f0580
Add latest changes from gitlab-org/gitlab@master
2020-07-29 12:09:45 +00:00
488d7d1f3d
Fix broken templated "Too many changes to show" text
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23230
broke the external string in 11.6. This fixes that and
adds a spec.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56138
2019-01-09 15:14:07 -08:00
58b3b7732b
Externalize strings from `/app/views/projects/diffs`
2018-11-20 12:38:52 +02:00
b413785e1d
[skip ci] Replace .pull-right with .float-right
2018-04-09 12:42:45 -05:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
70b05a8377
Split up MergeRequestsController
2017-06-28 18:17:44 -05:00
6595d6aab0
Bump gitlab_git to speedup DiffCollection iterations
2016-07-29 13:22:22 +02:00
78496e8c38
Disable overflow messages
...
With the option to expand and collapse individual diffs, these aren't
needed any more.
2016-07-08 10:57:21 +01:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
2f0c3ca352
Changed too many changes buttons to white
...
Closes #13751
2016-02-29 09:18:29 +00:00
3bee4a6712
Fix "Reload with full diff" URL button in compare branch view
...
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
2015-08-24 23:35:26 -07:00
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
5ee8ae4894
Detail too many warning to explain that merge will still work.
2015-07-06 22:03:36 +02:00
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 be5b6db8e0eb4803c741fcab
2015-05-05 18:51:12 +02:00
30ca451fd4
Refactor buttons
2015-03-14 00:29:32 -07:00
3bfd53149c
Replace bs-callout with alert
2015-03-06 18:36:22 -08:00
1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
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
ee804e2d94
Better English in the performance diff message.
2015-02-14 12:13:31 -08:00
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
02e87d9223
optimize show_diff_size_warning?
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 22:12:54 +03:00
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
GitLab Bot