Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -0/+1 |
* | Remove note from MR discussion when deleting it in the changes tab | Douglas Barbosa Alexandre | 2015-12-10 | 3 | -8/+45 |
* | Merge pull request #9850 from davydovanton/doc-fix-typos | Stan Hu | 2015-12-10 | 5 | -7/+7 |
|\ | |||||
| * | Fix typos in all docs [skip ci] | Anton Davydov | 2015-11-24 | 5 | -7/+7 |
* | | Merge branch 'user_file_uploads_documentation' into 'master' | Achilleas Pipinellis | 2015-12-10 | 2 | -1/+13 |
|\ \ | |||||
| * | | Document file upload random uuid security | Drew Blessing | 2015-12-10 | 2 | -1/+13 |
* | | | Merge branch 'feature/sidekiq-4' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 4 | -9/+21 |
|\ \ \ | |||||
| * | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4 | Gabriel Mazetto | 2015-12-10 | 4 | -9/+21 |
* | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 3 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | Add spec for invalid options in project creation | Stan Hu | 2015-12-09 | 1 | -0/+7 |
| * | | | | Provide better diagnostic message upon project creation errors | Stan Hu | 2015-12-09 | 2 | -2/+5 |
* | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 5 | -8/+49 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Make selectors more specific when scroll to element | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -1/+1 |
| * | | | | Make selectors more specific when setting the tab content | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+3 |
| * | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+2 |
| * | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-09 | 232 | -233/+453 |
| |\ \ \ \ | |||||
| * | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -0/+1 |
| * | | | | | Ensure new notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -3/+7 |
| * | | | | | Ensure existing notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -1/+3 |
| * | | | | | Ensure notes are replaced on a merge request diff when they're updated | Douglas Barbosa Alexandre | 2015-12-09 | 3 | -1/+36 |
* | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 3 | -1/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 3 | -1/+19 |
* | | | | | | | Merge branch 'add-changelog-items' into 'master' | Robert Speicher | 2015-12-10 | 1 | -1/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add missing changelog itemsadd-changelog-items | Douwe Maan | 2015-12-10 | 1 | -1/+8 |
* | | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' | Douwe Maan | 2015-12-10 | 100 | -2551/+2662 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching | Douwe Maan | 2015-12-10 | 351 | -873/+2656 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' | Robert Speicher | 2015-12-08 | 100 | -2551/+2662 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching | Douwe Maan | 2015-12-08 | 61 | -217/+473 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix RedactorFilter | Douwe Maan | 2015-12-08 | 1 | -1/+1 |
| | * | | | | | | | Move CombinedPipeline methods around | Douwe Maan | 2015-12-08 | 2 | -6/+8 |
| | * | | | | | | | Store the demodulized reference filter name in data attribute | Robert Speicher | 2015-12-07 | 4 | -18/+18 |
| | * | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-07 | 232 | -1350/+2600 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-03 | 88 | -348/+380 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-02 | 260 | -2488/+4137 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Move Markdown filters and pipelines into folders. | Douwe Maan | 2015-11-19 | 74 | -2042/+2007 |
| | * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-11-19 | 571 | -3223/+9811 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | gfm is no longer | Douwe Maan | 2015-10-27 | 1 | -1/+1 |
| | * | | | | | | | | | | | Reset memoized project repository when path changes | Douwe Maan | 2015-10-27 | 2 | -2/+3 |
| | * | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-27 | 113 | -729/+1365 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Use single_line Markdown pipeline for commit description | Douwe Maan | 2015-10-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Fix specs | Douwe Maan | 2015-10-22 | 1 | -4/+4 |
| | * | | | | | | | | | | | | Slight refactoring | Douwe Maan | 2015-10-22 | 1 | -10/+2 |
| | * | | | | | | | | | | | | Use correct var name | Douwe Maan | 2015-10-22 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Use faster, more appropriate pipeline for mentionable attributes | Douwe Maan | 2015-10-22 | 2 | -2/+2 |
| | * | | | | | | | | | | | | Disabling caching in test environment because it was causing issues with Mark... | Douwe Maan | 2015-10-22 | 2 | -9/+15 |
| | * | | | | | | | | | | | | Use markdown with gfm pipeline rather than gfm method | Douwe Maan | 2015-10-22 | 2 | -2/+2 |
| | * | | | | | | | | | | | | Fix Markdown XHTML context param | Douwe Maan | 2015-10-22 | 1 | -9/+10 |
| | * | | | | | | | | | | | | Make pipelines actually make sense | Douwe Maan | 2015-10-21 | 14 | -178/+265 |
| | * | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-21 | 280 | -2040/+3791 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Remove stray conflict marker | Douwe Maan | 2015-10-15 | 1 | -1/+0 |