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
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-01Fix Markdown styling inside reference linkspanjan
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
2016-10-24Add failing test for #21420winniehell
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-19Unfold references for group labels when moving issue to another projectDouglas 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-13Convert UTF-8 Emoji to Gitlab emojiJohan H
2016-10-11Convert unicode emojis to images.henrik
2016-10-10HTMLEntityFilter -> HtmlEntityFilterNick Thomas
2016-10-07Enable CacheMarkdownField for the remaining modelsNick Thomas
This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
2016-10-05Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable
See !6474.
2016-10-04Fixed banzai test failuresPhil Hughes
2016-10-03Imrove grammarKatarzyna Kobierska
2016-10-03Fix test, add author attribute to all testsKatarzyna Kobierska
2016-10-01Remove the task_list test since it is patched upstreamJared Deckard
2016-09-01Use JavaScript tooltips for mentions (!5301)winniehell
2016-08-10Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher
Do not look up commit again when it is passed to RelativeLinkFilter ## What does this MR do? Use `context[:commit]` in RelativeLinkFilter instead of looking up commit using `context[:ref]`. ## Why was this MR needed? Even though the commit object was already passed, unnecessary I/O is done to retrieve the commit object. ## What are the relevant issue numbers? Fixes #20026 See merge request !5455
2016-08-09Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher
Enable some Rubocop cops related to new lines ## What does this MR do? This MR enabled two additional Rubocop cops: Keeps track of empty lines around block bodies. `Style/EmptyLinesAroundBlockBody` Keeps track of empty lines around method bodies. ` Style/EmptyLinesAroundMethodBody` See merge request !5637
2016-08-05Add failing test for #7032winniehell
2016-08-03Enable some Rubocop cops related to new linesGrzegorz Bizon
2016-08-02Add failing test for #20026winniehell
2016-08-02Add failing tests for #19028winniehell
2016-07-26Ensure relative paths for video are rewritten as we do for imagesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-24Remove magic comments from Ruby files (!5456)winniehell
2016-07-20Remove VideoJS and clean the integrationRémy Coutable
Handle videos in: - MD preview in notes: commit, issue/MR, MR diff - New notes in: commit, issue/MR, MR diff - Persisted notes in: commit, issue/MR, MR diff Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-19Use a more powerful query to match videos in img tagsRémy Coutable
Also, always add a link to download videos since video playback is tricky. Also, it solves the issue with email client not supporting videos. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-19First support of videos in issues, MRs and notesEric Hayes
* Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
2016-07-18Don't parse Rinku returned value to DocFragment when it didn't change the ↵Paco Guzman
original html string.
2016-07-16Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan
2016-07-14stub out errors from the formatterhttp://jneen.net/
since we've eliminated #block_code
2016-07-14don't expect a random newline at the end of the thing?http://jneen.net/
2016-07-13Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre
2016-07-13Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre
2016-07-13Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre
2016-07-10Fix typo in specDouwe Maan
2016-07-10Add blockquote fence syntax to MarkdownDouwe Maan
2016-07-06Render references for labels that name contains ?, or &Douglas Barbosa Alexandre
2016-06-30Handle external issues in IssueReferenceFilterYorick Peterse
IssueReferenceFilter will end up processing internal issue references when a project uses an external issues tracker while still using internal issue references (in the form of `#\d+`). This commit ensures that these links are rendered as external issue links, regardless of whether the project one currently views uses an internal or external issues tracker. Fixes gitlab-org/gitlab-ce#19036, gitlab-com/performance#16
2016-06-27Wrap images in divs with Banzai and limit max-height.Connor Shea
Add max-height to prevent images from displaying larger than the provided screen size. Also fix a failing test and add a new one.
2016-06-23Merge branch 'fix-external-issue-links' into 'master' Robert Speicher
Handle external issues in IssueReferenceFilter Handling of external issues was broken when I refactored `IssueReferenceFilter` to use fewer SQL queries. Fixes #18827 See merge request !4789
2016-06-21Handle external issues in IssueReferenceFilterYorick Peterse
In the past this class would use Project#get_issue to retrieve an issue by its ID. This method would automatically determine whether to return an Issue or ExternalIssue. This commit changes IssueReferenceFilter to handle external issues again and in a somewhat more explicit manner than before. Fixes gitlab-org/gitlab-ce#18827
2016-06-21Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez
A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
2016-06-18Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher
Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
2016-06-18Fix RangeError exceptions when referring to issues or merge requests outside ↵Stan Hu
of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777
2016-06-18Fix bug in `WikiLinkFilter`.Timothy Andrew
1. An exception would be raised if the filter was called with an invalid URI. Mainly because we weren't catching the `Addressable` exception. 2. This commit fixes it and adds a spec for the filter.