Commit Graph

197 Commits

Author SHA1 Message Date
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Robert Speicher d49768296c Auto-correct `RSpec/DescribedClass` violations 2017-05-01 11:13:33 -04:00
Sean McGivern 2df748aa71 Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' 2017-04-27 11:02:27 +01:00
Lin Jen-Shin 9f7c29baef Follow feedback on the review 2017-04-26 02:38:59 +08:00
Lin Jen-Shin 4ded8b1cc0 Skip issuable without a project in IssuableExtractor#extract
Closes #31280
2017-04-25 18:39:41 +08:00
blackst0ne 31c990cc41 Fix rendering emoji inside a string 2017-04-25 21:06:24 +11:00
Douwe Maan ff986c7040 Merge branch '30672-versioned-markdown-cache' into 'master'
Start versioning cached markdown fields

Closes #30672

See merge request !10597
2017-04-21 19:25:39 +00:00
Nick Thomas d2b883b750 Start versioning cached markdown fields 2017-04-21 17:24:33 +01:00
Lin Jen-Shin 31ea72b62e Also test against external-issue for deleted projects
This is based on:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841
2017-04-21 16:02:03 +08:00
Lin Jen-Shin b43cabaf49 Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215
* upstream/master: (109 commits)
  Update CI templates to include 9.1 templates
  Change spec folder to match the assets one
  Update style_guide_js.md
  Milestones documentation refactor
  Adds documentation entry: Don't user forEach, aim for code without side effects
  Move kube namespace section to the variables one
  Changed milestone.to_reference calls into milestone.title for the show, edit and top views
  Update move icon to match others
  Issue Title Show Focus Check On Load
  Update Kubernetes namespace documentation
  Store projects in metrics for email replies
  Refactor into .vue files
  Adds vue js example application and documentation
  Add ES lint support to identify poorly written Promises
  Update plantuml.md to add the actual link.
  Fixed wording
  Add metrics events for incoming emails
  Remove helpers assigned_issuables_count and cached_assigned_issuables_count
  Refactor into .vue files part 2
  Fix headings
  ...
2017-04-21 15:51:33 +08:00
Stan Hu 8a570944a9 Fix Error 500 when referencing issue with project in pending delete
Closes #31215
2017-04-20 23:48:20 -07:00
Sean McGivern b99853f509 Merge branch 'issuable-state-custom-links' into 'master'
Do not append issuable state to links with custom anchor

Closes #30916

See merge request !10782
2017-04-20 09:52:39 +00:00
Sean McGivern 08b2e7cd8f Merge branch 'plantuml-filter-after-highlight' into 'master'
Fix PlantUML integration in GFM

Closes #30557

See merge request !10651
2017-04-20 07:06:05 +00:00
Adam Niedzielski 1269ee4c3b Do not append issuable state to links with custom anchor
Closes #30916
Change the presentation from [closed] to (closed)
2017-04-19 18:36:12 +02:00
Adam Niedzielski 0945dc4179 Fix PlantUML integration in GFM
Fixes #30557
Use "lang" attribute instead of "class" in PlantumlFilter.
2017-04-19 17:54:58 +02:00
Adam Niedzielski de71a46594 Display issuable state only in notes and issuable description
Closes #30964
2017-04-19 16:38:46 +02:00
Stan Hu e89d4741d3 Fix regression in rendering Markdown references that do not exist
Closes #30972
2017-04-15 07:26:32 -07:00
Adam Niedzielski 551d0a3c03 Fix appending state to issuable references
Closes #30874.
Ignore nodes with no children.
Append directly to the node instead of the last child of the node
to avoid inheriting formatting from the last child
2017-04-13 17:09:30 +02:00
Adam Buckland ace833b31d Add indication for closed or merged issuables in GFM
Example: for issues that are closed, the links will now show '[closed]'
following the issue number. This is done as post-process after the markdown has
been loaded from the cache as the status of the issue may change between
the cache being populated and the content being displayed.

In order to avoid N+1 queries problem when rendering notes ObjectRenderer
populates the cache of referenced issuables for all notes at once,
before the post processing phase.

As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes
method has been refactored to return a Hash utilising the node itself as the
key, since this was a common pattern of usage for this method.
2017-04-07 14:31:43 -05:00
Robert Speicher 2e8aa209f0 Merge branch '30125-markdown-security'
Remove class from SanitizationFilter whitelist

See merge request !2079
2017-04-05 21:03:46 -07:00
Sean McGivern 65cc277d64 Merge branch 'make_user_mentions_case_insensitive' into 'master'
Make user mentions case-insensitive

Closes #24493

See merge request !10285
2017-03-29 09:37:16 +00:00
blackst0ne e060153797 Make user mentions case-insensitive 2017-03-29 08:27:05 +11:00
Rémy Coutable 20bada3382 Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-28 10:52:13 +02:00
Douwe Maan f90909307e Fix specs 2017-03-14 15:29:31 -06:00
Filipa Lacerda 0ec62b6c5d Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis

Closes #26371

See merge request !9569
2017-03-07 02:34:48 +00:00
Eric Eastwood f602efea65 Fix wrong image src with cached gl-emoji and relative root 2017-03-06 12:54:46 -06:00
Eric Eastwood e6fc0207cb Use native unicode emojis
- gl_emoji for falling back to image/css-sprite when the browser
   doesn't support an emoji
 - Markdown rendering (Banzai filter)
 - Autocomplete
 - Award emoji menu
    - Perceived perf
    - Immediate response because we now build client-side
 - Update `digests.json` generation in gemojione rake task to be more
   useful and  include `unicodeVersion`

MR: !9437

See issues

 - #26371
 - #27250
 - #22474
2017-03-06 12:54:46 -06:00
James 00f5cb84d5 SanitizationFilter allows html5 details and summary (Issue #21605)
Also adds details/summary tags to Copy-as-GFM
2017-03-06 16:27:49 +00:00
Douwe Maan 6fd28ff244 Use full group name in GFM group reference title 2017-03-01 17:07:43 -06:00
Robert Speicher e051ef69e3 Merge branch '20890-comment-image-inline' into 'master'
Fix inline comment images by removing wrapper #20890

Closes #20890

See merge request !5804
2017-02-27 19:23:05 +00:00
Douwe Maan 02aad721f1 Only yield valid references in ReferenceFilter.references_in 2017-02-16 14:06:24 -06:00
Dmitriy Zaporozhets 2c55fd0019 Add GFM support to nested groups
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-13 22:30:10 +02:00
Sean McGivern 52ea505126 Merge branch 'markdown-plantuml' into 'master'
PlantUML support for Markdown

Closes #4048

See merge request !8588
2017-02-03 12:37:37 +00:00
Adam Pahlevi a0586dbc16 replace `find_with_namespace` with `find_by_full_path`
add complete changelog for !8949
2017-02-03 07:14:04 +07:00
Horacio Sanson d9e9ad2211 PlantUML support for Markdown
Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks:

    ```plantuml
    Bob -> Sara : Hello
    Sara -> Bob : Go away
    ```

Closes: #4048
2017-02-03 08:49:48 +09:00
Rémy Coutable 18c5983b5c Merge branch 'rs-empty_project-lib' into 'master'
Use `:empty_project` where possible throughout spec/lib

See merge request !8767
2017-01-26 12:29:51 +00:00
Robert Speicher 80a6d2fda2 Use `:empty_project` where possible throughout spec/lib 2017-01-25 12:25:42 -05:00
Douwe Maan 21755ac9e9 Merge branch 'master' into copy-as-md
# Conflicts:
#	app/assets/javascripts/lib/utils/common_utils.js.es6
2017-01-25 11:23:25 -06:00
Jarka Kadlecova 0c350b7939 address comments 2017-01-25 10:10:05 +01:00
Jarka Kadlecova bf708e55c2 make mentions working when project not specified 2017-01-18 18:38:17 -05:00
Douwe Maan 72620ea1b7 Fix SyntaxHighlightFilter spec 2017-01-17 13:06:12 -05:00
Sean McGivern cdba3fe870 Merge branch 'issue_25682' into 'master'
Parse JIRA issue references even if Issue Tracker is disabled

Closes #25682

See merge request !8238
2016-12-29 20:12:45 +00:00
Felipe Artur f9963fe029 Parse JIRA issue references even if Issue Tracker is disabled 2016-12-29 16:52:04 -02:00
Robert Speicher 7e26afe6e8 Merge branch 'inline-math-dollar' into 'master'
Don't render inline math when dollar signs are inside markup

See merge request !8259
2016-12-22 14:23:37 +00:00
Douwe Maan e46f2c53a2 Don't render inline math when dollar signs are inside markup 2016-12-22 14:16:31 +01:00
Douwe Maan 1b6c663cb2 Fix lookup of project by unknown ref when caching is enabled 2016-12-22 11:44:43 +01:00
Makoto Scott-Hinkle 15d83f6ae2 Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742. 2016-12-21 08:34:30 -08:00
Sean McGivern 4d1f583712 Merge branch 'katex-math' into 'master'
Render math in Asciidoc and Markdown with KaTeX using code blocks

Closes #13690 and #13180

See merge request !8003
2016-12-15 14:11:38 +00:00
Munken 2d170a20dc Render math in Asciidoc and Markdown with KaTeX using code blocks 2016-12-14 16:50:54 +00:00
Gabriel Mazetto 3445136b9b Merge branch 'unescape-relative-path' into 'master'
Avoid escaping relative links in Markdown twice

## What does this MR do?

Avoid escaping relative links in Markdown twice.

## Why was this MR needed?

Relative links with special characters (e.g. spaces) were escaped twice.

## What are the relevant issue numbers?

closes #25191, #25318

See merge request !7940
2016-12-12 17:15:40 +00:00