summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' Dmitriy Zaporozhets2015-12-111-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
* | | | | | | | | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-113-3/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-103-3/+4
* | | | | | | | | Merge pull request #9850 from davydovanton/doc-fix-typosStan Hu2015-12-105-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix typos in all docs [skip ci]Anton Davydov2015-11-245-7/+7
* | | | | | | | | Merge branch 'user_file_uploads_documentation' into 'master' Achilleas Pipinellis2015-12-102-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document file upload random uuid securityDrew Blessing2015-12-102-1/+13
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/sidekiq-4' into 'master' Dmitriy Zaporozhets2015-12-104-9/+21
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-104-9/+21
* | | | | | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu...Dmitriy Zaporozhets2015-12-103-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add spec for invalid options in project creationStan Hu2015-12-091-0/+7
| * | | | | | | | | Provide better diagnostic message upon project creation errorsStan Hu2015-12-092-2/+5
* | | | | | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-105-8/+49
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make selectors more specific when scroll to elementDouglas Barbosa Alexandre2015-12-101-1/+1
| * | | | | | | | | Make selectors more specific when setting the tab contentDouglas Barbosa Alexandre2015-12-101-3/+3
| * | | | | | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-3/+2
| * | | | | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-09232-233/+453
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2015-12-091-0/+1
| * | | | | | | | | | Ensure new notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-3/+7
| * | | | | | | | | | Ensure existing notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-1/+3
| * | | | | | | | | | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-093-1/+36
* | | | | | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-103-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-103-1/+19
* | | | | | | | | | | Merge branch 'add-changelog-items' into 'master' Robert Speicher2015-12-101-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing changelog itemsadd-changelog-itemsDouwe Maan2015-12-101-1/+8
* | | | | | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' Douwe Maan2015-12-10100-2551/+2662
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-10351-873/+2656
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-08100-2551/+2662
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0861-217/+473
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix RedactorFilterDouwe Maan2015-12-081-1/+1
| | * | | | | | | | | | | Move CombinedPipeline methods aroundDouwe Maan2015-12-082-6/+8
| | * | | | | | | | | | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-074-18/+18
| | * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07232-1350/+2600
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0388-348/+380
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-02260-2488/+4137
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Move Markdown filters and pipelines into folders.Douwe Maan2015-11-1974-2042/+2007
| | * | | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-19571-3223/+9811
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | gfm is no longerDouwe Maan2015-10-271-1/+1
| | * | | | | | | | | | | | | | | Reset memoized project repository when path changesDouwe Maan2015-10-272-2/+3
| | * | | | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-27113-729/+1365
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Use single_line Markdown pipeline for commit descriptionDouwe Maan2015-10-231-1/+1
| | * | | | | | | | | | | | | | | | Fix specsDouwe Maan2015-10-221-4/+4
| | * | | | | | | | | | | | | | | | Slight refactoringDouwe Maan2015-10-221-10/+2
| | * | | | | | | | | | | | | | | | Use correct var nameDouwe Maan2015-10-221-1/+1
| | * | | | | | | | | | | | | | | | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-222-2/+2
| | * | | | | | | | | | | | | | | | Disabling caching in test environment because it was causing issues with Mark...Douwe Maan2015-10-222-9/+15
| | * | | | | | | | | | | | | | | | Use markdown with gfm pipeline rather than gfm methodDouwe Maan2015-10-222-2/+2
| | * | | | | | | | | | | | | | | | Fix Markdown XHTML context paramDouwe Maan2015-10-221-9/+10
| | * | | | | | | | | | | | | | | | Make pipelines actually make senseDouwe Maan2015-10-2114-178/+265