Commit graph

16 commits

Author SHA1 Message Date
GitLab Bot
9c0f4306f6 Add latest changes from gitlab-org/gitlab@master 2021-03-11 15:09:10 +00:00
GitLab Bot
68d3f33d51 Add latest changes from gitlab-org/gitlab@master 2019-11-26 15:06:50 +00:00
gfyoung
7e6f6e1603 Enable even more frozen string in lib/gitlab
Enables frozens string for the following:

* lib/gitlab/conflict/**/*.rb
* lib/gitlab/cross_project_access/**/*.rb
* lib/gitlab/cycle_analytics/**/*.rb
* lib/gitlab/data_builder/**/*.rb
* lib/gitlab/database/**/*.rb
* lib/gitlab/dependency_linker/**/*.rb
* lib/gitlab/diff/**/*.rb
* lib/gitlab/downtime_check/**/*.rb
* lib/gitlab/email/**/*.rb
* lib/gitlab/etag_caching/**/*.rb

Partially addresses gitlab-org/gitlab-ce#47424.
2018-11-06 22:47:32 -08:00
Douwe Maan
98106ec54e
Merge branch '42028-xss-diffs-10-6' into 'security-10-6'
Port of "Fix XSS on commit diff view" for 10-6

See merge request gitlab/gitlabhq!2364
2018-04-05 08:40:05 +02:00
micael.bergeron
46e4e8f4dc changed InlineDiffMarker to make it html_safe its output
updated the spec
2017-09-12 13:42:40 -04:00
Douwe Maan
e179707844 Extract generic parts of Gitlab::Diff::InlineDiffMarker 2017-05-10 08:26:21 -05:00
Douwe Maan
b7d8df503c Enable Style/MutableConstant 2017-02-23 09:31:56 -06:00
Rémy Coutable
5341b16fc9
Reuse existing SCSS variables
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 13:20:46 -05:00
Adam Butler
8a8b5497c5 Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff 2016-05-18 11:15:10 -05:00
Douwe Maan
677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Douwe Maan
6000f8545f Validate bounds just to be sure 2016-01-20 19:33:34 +01:00
Douwe Maan
577f2fb47a Save and use actual diff base commit for MR diff highlighting 2016-01-20 18:44:27 +01:00
Douwe Maan
a010db5db2 Properly handle HTML entities with inline diffs 2016-01-20 15:26:44 +01:00
Douwe Maan
0a8039eb77 Remove useless assignments 2016-01-19 13:56:36 +01:00
Douwe Maan
12546f895f Add tests 2016-01-15 16:29:26 +01:00
Douwe Maan
5de8971ddf Whoops, forgot to add files 2016-01-15 16:02:48 +01:00