Commit Graph

21 Commits

Author SHA1 Message Date
GitLab Bot 7a8d983c19 Add latest changes from gitlab-org/gitlab@master 2020-09-24 09:09:35 +00:00
Douwe Maan 0c902da153
Add .code to all tables holding diffs
We need this to be able to distinguish between Markdown tables and diff
tables.
2019-03-26 14:35:43 +01:00
Robert Speicher 94531f76d4
Correct remaining `Lint/UselessAssignment` haml-lint violations 2018-08-31 18:29:37 -07:00
Filipa Lacerda e49aaf838a
Adds padding to the error block 2018-04-16 18:48:53 +01:00
Filipa Lacerda 4b2ff00392
Disable try again button while fetching the API 2018-04-16 16:36:24 +01:00
Filipa Lacerda 8f189df86f
Use different class for try again button in collapsed diffs 2018-04-16 12:30:46 +01:00
Filipa Lacerda a236b5e6a2 Render only one error message per diff
Move html to haml file instead of JS
2018-04-13 09:50:35 +01:00
Filipa Lacerda b01fd7ad81
Fixes unresolved discussions rendering the error state instead of the diff 2018-04-12 17:29:54 +01:00
Simon Knox 8fa001e760 Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" 2018-03-13 12:01:36 +00:00
Clement Ho eff96b8c77 Fix unable to expand text diff discussion comments 2017-10-10 15:36:32 +00:00
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
Eric Eastwood e373ed514d Fix file diff title and renames alignment in discussions
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31782

The unused toggle was removed previously,
cc37d1dfa1 (cf11229dd714f7f4b46f102ce6846e25528b6689_7_6)
2017-06-14 13:14:59 -05:00
Douwe Maan 7c479d88a9 Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-23 15:37:05 -05:00
Douwe Maan cc37d1dfa1 Remove unused toggle from diff discussion diff headers 2017-05-09 17:23:08 -05:00
Douwe Maan f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Douwe Maan fe26b8af94
Correctly display multiple separate discussions on the same diff line 2017-04-05 17:44:14 +01:00
Filipa Lacerda b57027f2a5 Use a new class to keep old behavior 2017-02-08 20:52:08 -06:00
Douwe Maan 080924f979 Fix bug where notes weren’t shown in discussion when the code had changed after creation 2016-08-19 12:38:40 -05:00
Douwe Maan 6a355d451e Improve performance of MR show page 2016-08-18 19:08:59 -05:00
Douwe Maan 6d9715d877 Show existing discussion when adding new comment on line with a hidden resolved discussion 2016-07-28 19:28:56 -06:00
Douwe Maan 79214be727 Add Discussion model to represent MR/diff discussion 2016-07-20 16:18:18 -06:00