Commit graph

11 commits

Author SHA1 Message Date
GitLab Bot
1808454313 Add latest changes from gitlab-org/gitlab@master 2020-01-31 12:08:33 +00:00
Thong Kuah
a2cfc150ce Add # frozen_string_literal to spec/models
Adds `# frozen_string_literal: true` to spec/models ruby files
2019-04-01 14:37:54 +13:00
Rémy Coutable
3a2abc1d50
Enable the Layout/ExtraSpacing cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
Douwe Maan
047b7e506e
Allow truncated_diff_lines to be called on image diff discussion 2018-12-20 16:40:51 +01:00
Tiago Botelho
7385e7cd47
Backports changes made to One notification per code review
The EE merge request can be found here:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8442
2018-12-07 14:24:37 +00:00
Oswaldo Ferreira
bb8f2520b4 Persist truncated note diffs on a new table
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
2018-05-24 15:34:43 -03:00
Sean McGivern
382421a9be Fix truncated_diff_lines for legacy notes without a line
It appears that some legacy diff notes on GitLab.com have invalid line codes,
which means truncated_diff_lines won't work. This is just a band-aid solution,
as neither the diff nor the discussion will display correctly for these notes,
but they won't cause a 500 error.
2018-01-30 15:17:44 +00:00
Keifer Furzland
7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Douwe Maan
0bf339f0ed Address review 2017-05-24 10:10:10 -05:00
Sean McGivern
5069682d8e Enable RSpec/FilePath cop
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
2017-04-26 12:50:32 +01:00
Douwe Maan
c319f21141
Address review comments 2017-04-05 17:44:14 +01:00