Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-25Merge branch 'master' into copy-as-mdDouwe Maan
# Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
2017-01-25address commentsJarka Kadlecova
2017-01-19Merge branch 'master' into copy-as-mdDouwe Maan
# Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
2017-01-19make mentions working when project not specifiedJarka Kadlecova
2017-01-17Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan
2017-01-17Fix SyntaxHighlightFilter specDouwe Maan
2017-01-17Correct documentation for `data_attribute` methodRobert Speicher
Also break up a long line, just 'cause.
2017-01-17Improve specDouwe Maan
2017-01-17Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan
2016-12-22Merge branch 'inline-math-dollar' into 'master' Robert Speicher
Don't render inline math when dollar signs are inside markup See merge request !8259
2016-12-22Don't render inline math when dollar signs are inside markupDouwe Maan
2016-12-22Use `ref` variableDouwe Maan
2016-12-22Fix lookup of project by unknown ref when caching is enabledDouwe Maan
2016-12-21Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742.Makoto Scott-Hinkle
2016-12-15Merge branch 'katex-math' into 'master' Sean McGivern
Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
2016-12-14Render math in Asciidoc and Markdown with KaTeX using code blocksMunken
2016-12-13Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern
Minor improvements to nested groups code See merge request !8011
2016-12-12Merge branch 'unescape-relative-path' into 'master' Gabriel Mazetto
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-12Avoid escaping relative links in Markdown twice (!7940)winniehell
2016-12-11Rename Routable.where_paths_in to Routable.where_full_path_inDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-09Better location for math lexerMunken
2016-12-09Removed alias and filenamesMunken
2016-12-09Hacked in Math LexerMunken
2016-12-09Math works for inline syntaxMunken
2016-12-09Working inline math filterMunken
2016-12-03Add shorthand support to gitlab markdown referencesOswaldo Ferreira
2016-12-01remove underscore from user-content id namespaceMike Greiling
2016-12-01add transparent namespace to all user-generated anchors in GitLab flavored ↵Mike Greiling
markdown
2016-11-09Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan
Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-09Merge branch 'issue_23548_dev' into 'master'Douwe Maan
disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04Split out markdown cache storage into a separate methodNick Thomas
2016-11-01Fix Markdown styling inside reference linkspanjan
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
2016-10-28Pass user instance to Labels::FindOrCreateService or skip_authorization: trueAdam Niedzielski
Do not pass project.owner because it may return a group and Labels::FindOrCreateService throws an error in this case. Fixes #23694.
2016-10-24Escape ref and path for relative links (!6050)winniehell
2016-10-19Merge branch 'feature/group-level-labels' into 'master' Douwe Maan
Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #19997 See merge request !6425
2016-10-19Merge branch 'issue_828' into 'master' Douwe Maan
Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728
2016-10-19Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre
2016-10-19Fix replace label references with links for group labelsDouglas Barbosa Alexandre
2016-10-19Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre
2016-10-19Unfold references for group labels when moving issue to another projectDouglas Barbosa Alexandre
2016-10-19Add ProjectLabel modelDouglas Barbosa Alexandre
2016-10-19Replace label references with links for group labelsDouglas Barbosa Alexandre
2016-10-19Prevent wrong markdown on issue ids when project has Jira service activatedFelipe Artur
2016-10-19Merge branch 'fix-escaping' into 'master' Sean McGivern
fix: commit messages being double-escaped in activities tab See merge request !6937
2016-10-18Add Nofollow for uppercased scheme in external urlthe-undefined
Ensure that external URLs with non-lowercase protocols will be attributed with 'nofollow noreferrer' and open up in a new window. Covers the edge cases to skip: - HTTPS schemes - relative links Closes #22782
2016-10-18fix: commit messages being double-escaped in activies tabamaia
2016-10-16Add RTL support to markdown rendererEbrahim Byagowi
2016-10-14Use module_function in Banzai::RendererYorick Peterse
Using `extend self` prevents GitLab Performance Monitoring from being able to track class methods. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23347
2016-10-13Convert UTF-8 Emoji to Gitlab emojiJohan H
2016-10-11Convert unicode emojis to images.henrik