Commit Graph

44 Commits

Author SHA1 Message Date
GitLab Bot 9c1b7080eb Add latest changes from gitlab-org/gitlab@master 2025-01-07 15:31:56 +00:00
GitLab Bot ecdd26856c Add latest changes from gitlab-org/gitlab@master 2024-01-02 12:07:21 +00:00
GitLab Bot 774f6e6e98 Add latest changes from gitlab-org/gitlab@master 2023-10-24 21:12:08 +00:00
GitLab Bot c972699d39 Add latest changes from gitlab-org/gitlab@master 2023-06-20 21:09:21 +00:00
GitLab Bot fd1c75caeb Add latest changes from gitlab-org/gitlab@master 2022-08-02 03:09:33 +00:00
GitLab Bot ec3e75cfea Add latest changes from gitlab-org/gitlab@master 2022-06-15 21:10:04 +00:00
GitLab Bot 93003eb115 Add latest changes from gitlab-org/gitlab@master 2022-03-17 21:08:35 +00:00
GitLab Bot 861cc0c363 Add latest changes from gitlab-org/gitlab@master 2021-07-30 18:09:08 +00:00
GitLab Bot 3462d7613f Add latest changes from gitlab-org/gitlab@master 2021-07-07 00:07:23 +00:00
GitLab Bot 5b829393a7 Add latest changes from gitlab-org/gitlab@master 2021-06-14 21:10:22 +00:00
GitLab Bot f26782b146 Add latest changes from gitlab-org/gitlab@master 2021-05-21 18:11:01 +00:00
GitLab Bot 133ec9237a Add latest changes from gitlab-org/gitlab@master 2021-05-12 09:10:19 +00:00
GitLab Bot 25db9c1230 Add latest changes from gitlab-org/gitlab@master 2021-05-06 12:10:38 +00:00
GitLab Bot 8f4d63426a Add latest changes from gitlab-org/gitlab@master 2021-05-05 18:10:31 +00:00
GitLab Bot 4d16568658 Add latest changes from gitlab-org/gitlab@master 2021-03-18 06:11:52 +00:00
GitLab Bot c59765a50a Add latest changes from gitlab-org/gitlab@master 2020-06-24 18:09:03 +00:00
GitLab Bot 3ad11f24ca Add latest changes from gitlab-org/gitlab@master 2019-12-22 09:07:51 +00:00
GitLab Bot 9763c08170 Add latest changes from gitlab-org/gitlab@master 2019-12-17 03:07:45 +00:00
GitLab Bot 175b4fa261 Add latest changes from gitlab-org/gitlab@master 2019-12-11 18:08:10 +00:00
GitLab Bot 18a102a5b9 Add latest changes from gitlab-org/gitlab@master 2019-11-08 03:06:48 +00:00
Patrick Bajao 6d318af5f9 Revert "Merge branch '65152-selective-highlight' into 'master'"
This reverts merge request !31361
2019-08-09 00:13:09 +00:00
Patrick Bajao 46631e1023 Support selective highlighting of lines
Instead of highlighting all lines when not all of them are
needed, only highlight specific lines.

The `BlobPresenter#highlight` method has been updated to
support `since` and `to` params. These params will be used to
limit the content to be highlighted.

Modify `Gitlab::Highlight` to support `since` param which will
then be used to determine the starting line number.
2019-08-06 09:32:29 +08:00
Zoid 4a34994462 Bump rouge to 3.4.1
https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-341-2019-06-13
2019-06-21 13:20:41 +00:00
Mark Chao bc14e4ed10 Move :plain option to Highlight class
This is to DRY the repeated file size check.

Move spec and constants to Highlight
2018-10-30 15:44:55 +08:00
Mark Chao 39ae9a59a5 Make Highlight accept language param
This replaces the repository param.
This allows more flexiblity as sometimes we have highlight content
not related to repository. Sometimes we know ahead of time the language
of the content. Lastly language determination seems better fit as a
logic in the Blob class.
`repository` param is only used to determine the language, which seems
to be the responsiblity of Blob.
2018-10-30 15:44:55 +08:00
Mark Chao 3bfc08be91 Fix syntax highlight taking too long
Use Timeout to switch to plain rendering
2018-09-03 11:02:43 +08:00
Rémy Coutable cddc5cacfb Use described_class when possible
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:53 +02:00
Rémy Coutable ddccd24c13 Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:53 +02:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Douwe Maan e6e29f9220 Use Diff::File blob methods from diff highlighter 2017-06-08 09:39:54 -05:00
Douwe Maan aa24feed6f Refactor DependencyLinker::BaseLinker 2017-05-23 15:34:42 -05:00
Douwe Maan b1012d986c Autolink package names in Gemfile 2017-05-10 08:26:21 -05:00
Douwe Maan f90909307e Fix specs 2017-03-14 15:29:31 -06:00
Valery Sizov ceb1ebd959 Active tense test coverage
Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
2017-02-01 22:45:41 +00:00
Robert Speicher 80a6d2fda2 Use `:empty_project` where possible throughout spec/lib 2017-01-25 12:25:42 -05:00
Rémy Coutable fe25d1d5cf Fix specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-01 13:24:06 +02:00
Stan Hu 3fe18525dd Trim extra displayed carriage returns in diffs and files with CRLFs
Closes #20440
2016-08-01 13:24:06 +02:00
http://jneen.net/ 66b37149eb support cgi style options, such as erb?parent=json 2016-06-27 14:17:49 -07:00
http://jneen.net/ 9fc53864dd appease rubocop 2016-06-27 14:17:49 -07:00
http://jneen.net/ 5415c67424 check the tag so that an instance will pass too 2016-06-27 14:17:49 -07:00
http://jneen.net/ cd9bea770b fix the spec, using project.change_head 2016-06-27 14:17:49 -07:00
http://jneen.net/ f8b80f7fae add custom highlighting via .gitattributes
paired with @stanhu
2016-06-27 14:17:49 -07:00
Douwe Maan d1938fae3d Add missing specs 2016-01-19 16:26:44 +01:00