Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'ignore-references' into 'master' | Dmitriy Zaporozhets | 2015-06-02 | 2 | -39/+29 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753 | |||||
| * | | | Ignore references in blockquotes. | Douwe Maan | 2015-06-02 | 2 | -5/+12 | |
| | | | | ||||||
| * | | | Actually ignore references in code blocks etc. | Douwe Maan | 2015-06-02 | 1 | -34/+17 | |
| |/ / | ||||||
* | | | Further limit the limited whitelist for project/group descriptionsrs-more-nofollow | Robert Speicher | 2015-06-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | Add a `pipeline` context option for SanitizationFilter | Robert Speicher | 2015-06-02 | 2 | -21/+40 | |
|/ / | | | | | | | | | When this option is `:description`, we use a more restrictive whitelist. This is used for Project and Group description fields. | |||||
* | | Remove unnecessary satellite files and add CHANGELOG item | Dmitriy Zaporozhets | 2015-06-02 | 2 | -67/+0 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Remove now unnecessary satelittes logic for creating and editing file with ↵web-editor-rugged | Dmitriy Zaporozhets | 2015-06-02 | 3 | -143/+0 | |
| | | | | | | | | | | | | web editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add ExternalLinkFilter to Markdown pipeliners-dont-follow-me | Robert Speicher | 2015-05-27 | 2 | -0/+35 | |
| | | | | | | | | Forces a `rel="nofollow"` attribute on all external links. | |||||
* | | Make use of to_reference in more specs | Robert Speicher | 2015-05-26 | 6 | -8/+11 | |
| | | ||||||
* | | Support only double quotes for multi-word label references | Robert Speicher | 2015-05-26 | 1 | -2/+1 | |
| | | ||||||
* | | Add `reference_pattern` to Referable models | Robert Speicher | 2015-05-26 | 9 | -65/+16 | |
| | | ||||||
* | | Correct the ReferenceFilter html/pipeline/filter require | Robert Speicher | 2015-05-26 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'rs-issue-1690' into 'master' | Dmitriy Zaporozhets | 2015-05-26 | 1 | -3/+3 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Better handle label references that aren't actually references Fixes #1690 See merge request !705 | |||||
| * | | Better handle label references that aren't actually referencesrs-issue-1690 | Robert Speicher | 2015-05-25 | 1 | -3/+3 | |
| |/ | | | | | | | Fixes #1690 | |||||
* | | Remove Rack Attack monkey patches and bump to version 4.3.0 | Stan Hu | 2015-05-22 | 2 | -32/+0 | |
|/ | ||||||
* | Customize the sanitization whitelist only oncers-issue-1651 | Robert Speicher | 2015-05-20 | 1 | -13/+22 | |
| | | | | Fixes #1651 | |||||
* | Subclass TaskList::Filter to fix a bugrs-issue-1645 | Robert Speicher | 2015-05-20 | 2 | -2/+25 | |
| | | | | | | | | | Instead of using a fork, we subclass the filter and only apply the `task-list` class to list items that actually are task lists. Closes #1645 See https://github.com/github/task_list/pull/60 | |||||
* | Simplify and unify helpers for rendering markup | Jakub Jirutka | 2015-05-18 | 1 | -3/+5 | |
| | ||||||
* | Rename MarkdownHelper to MarkupHelper | Jakub Jirutka | 2015-05-18 | 1 | -1/+1 | |
| | ||||||
* | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) | Jakub Jirutka | 2015-05-18 | 2 | -1/+70 | |
| | ||||||
* | Add search issues/MR by number | Nikita Verkhovin | 2015-05-18 | 1 | -2/+14 | |
| | ||||||
* | Merge branch 'dashboard-references' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -7/+9 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653 | |||||
| * | Fix reference links in dashboard activity and ATOM feeds.dashboard-references | Douwe Maan | 2015-05-14 | 1 | -7/+9 | |
| | | ||||||
* | | Merge branch 'rs-relative-link-filter' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -17/+31 | |
|\ \ | |/ |/| | | | | | | | Minor RelativeLinkFilter cleanup See merge request !649 | |||||
| * | Minor RelativeLinkFilter cleanuprs-relative-link-filter | Robert Speicher | 2015-05-13 | 2 | -17/+31 | |
| | | ||||||
* | | Use SIGKILL by default in Sidekiq::MemoryKiller | Jacob Vosmaer | 2015-05-13 | 1 | -1/+1 | |
|/ | | | | | | | This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM. | |||||
* | Merge branch 'text-batch-1' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 4 | -31/+43 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642 | |||||
| * | Fix GitAccess.text-batch-1 | Douwe Maan | 2015-05-13 | 1 | -2/+3 | |
| | | ||||||
| * | Improve OAuth signup error message. | Douwe Maan | 2015-05-13 | 1 | -2/+2 | |
| | | ||||||
| * | Improve description of branch protection levels. | Douwe Maan | 2015-05-13 | 1 | -3/+3 | |
| | | ||||||
| * | Improve Git access error messages. | Douwe Maan | 2015-05-13 | 2 | -26/+37 | |
| | | ||||||
* | | Merge pull request #9276 from jirutka/relative_link_filter | Dmitriy Zaporozhets | 2015-05-13 | 2 | -1/+122 | |
|\ \ | |/ |/| | Extract handling of relative file links to its own HTML filter | |||||
| * | RelativeLinkFilter: refactor according to suggestions by @tsigo | Jakub Jirutka | 2015-05-11 | 2 | -17/+13 | |
| | | ||||||
| * | Extract handling of relative file links to RelativeLinkFilter | Jakub Jirutka | 2015-05-11 | 2 | -1/+126 | |
| | | ||||||
* | | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users | Douwe Maan | 2015-05-12 | 1 | -1/+1 | |
|/ | ||||||
* | Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-class | Robert Speicher | 2015-05-08 | 1 | -2/+17 | |
| | ||||||
* | Merge branch 'rs-task_list' into 'master' | Dmitriy Zaporozhets | 2015-05-08 | 2 | -30/+8 | |
|\ | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599 | |||||
| * | Update Markdown help docs for latest changes | Robert Speicher | 2015-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | Remove all references to `parse_tasks` | Robert Speicher | 2015-05-06 | 1 | -28/+3 | |
| | | ||||||
| * | Add TaskList::Filter to pipeline | Robert Speicher | 2015-05-06 | 1 | -4/+7 | |
| | | ||||||
* | | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var | Jacob Vosmaer | 2015-05-07 | 1 | -5/+6 | |
|/ | | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com. | |||||
* | Update authentication.rb | quodos | 2015-05-04 | 1 | -1/+1 | |
| | | | correct spelling | |||||
* | Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties | Dmitriy Zaporozhets | 2015-05-03 | 2 | -7/+16 | |
|\ | | | | | add common method to force utf8 and force oauth properties to be utf8 | |||||
| * | add common method to force utf8 and force oauth properties to be utf8 | Onur Küçük | 2015-05-03 | 2 | -7/+16 | |
| | | ||||||
* | | Remove title_for_issue helper | Robert Speicher | 2015-04-30 | 1 | -5/+1 | |
| | | ||||||
* | | Remove special handling for the `'` problem | Robert Speicher | 2015-04-30 | 1 | -1/+0 | |
| | | | | | | | | | | | | While `escape_once` will create this HTML entity, Nokogiri always translates it back before it gets to IssueReferenceFilter, so there should be no danger of erroneous issue links. | |||||
* | | Add Project#get_issue | Robert Speicher | 2015-04-30 | 1 | -7/+6 | |
| | | ||||||
* | | Rename SCHEME_PATTERN to LINK_PATTERN | Robert Speicher | 2015-04-30 | 1 | -5/+5 | |
| | | ||||||
* | | Autolink short URLs | Robert Speicher | 2015-04-30 | 1 | -1/+4 | |
| | | ||||||
* | | Update Autolink SCHEME_PATTERN | Robert Speicher | 2015-04-30 | 1 | -1/+3 | |
| | |