summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-183-1/+13
|\
| * Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-183-1/+13
* | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-0/+26
|/
* Track method call times/counts as a single metricYorick Peterse2016-06-173-6/+111
* Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-1/+1
|\
| * Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_re...registry-500-fixKamil Trzcinski2016-06-171-1/+1
* | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-0/+16
|\ \
| * | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-0/+16
* | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-1/+13
|\ \ \ | |/ / |/| |
| * | Don't update columns in batches in a transactionYorick Peterse2016-06-151-1/+1
| * | Customizing of update_column_in_batches queriesYorick Peterse2016-06-151-0/+12
* | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-177-0/+5705
|\ \ \
| * \ \ fixed merge conflicts on UI branchJames Lopez2016-06-1617-68/+650
| |\ \ \
| | * \ \ fixed merge conflictsJames Lopez2016-06-1617-68/+650
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1617-68/+650
| | | |\ \ \
| | | * | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1616-632/+66
| | | * | | | squashed merge and fixed conflictsJames Lopez2016-06-1616-66/+632
| | | * | | | fix indentsJames Lopez2016-06-141-5/+5
| * | | | | | fix annoying specJames Lopez2016-06-151-1/+1
| * | | | | | fixing specs and some code cleanupJames Lopez2016-06-152-2/+3
| |/ / / / /
| * | | | | fix mergeJames Lopez2016-06-141-5/+5
| * | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-142-26/+87
| |\ \ \ \ \ | | |/ / / /
| | * | | | better coverage for ReaderJames Lopez2016-06-141-0/+61
| | * | | | few changes based on MR feedbackJames Lopez2016-06-131-1/+1
| * | | | | few more changes based on feedbackJames Lopez2016-06-131-1/+1
| * | | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-131-303/+150
| * | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-1376-639/+2656
| |\ \ \ \ \ | | |/ / / /
| | * | | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-132-12/+19
| | * | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-1322-323/+564
| | |\ \ \ \
| | * | | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-4/+21
| | * | | | | started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-032-4/+4
| | * | | | | merge hellJames Lopez2016-06-0357-393/+2145
| | |\ \ \ \ \
| | * | | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-0357-2145/+393
| | * | | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-0357-393/+2145
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-181-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | fixed CI commits on exportJames Lopez2016-05-181-2/+7
| * | | | | | | fix merge conflictsJames Lopez2016-05-161-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | some changes based on MR feedbackJames Lopez2016-05-161-3/+3
| * | | | | | | fix specJames Lopez2016-05-131-2/+6
| * | | | | | | fixed leaving comments on notes about missing authorsJames Lopez2016-05-131-1/+1
| * | | | | | | update json and fix notes issueJames Lopez2016-05-131-154/+5215
| * | | | | | | add message to notes about missing author on importJames Lopez2016-05-132-7/+6
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-121-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | add author on notes to export - so we can add to a note if project member is ...James Lopez2016-05-121-0/+7
| * | | | | | | refactored import to use shared error stuff and fixed a few issues with recen...James Lopez2016-05-111-1/+2
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-101-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | added better error handling. Also refactored some of the code and fixed a few...James Lopez2016-05-101-2/+2
| * | | | | | | fixed more import merging issuesJames Lopez2016-05-101-1/+0
| * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-093-26/+34
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-05-092-23/+33
| | |\ \ \ \ \ \
View Lorry Controller Status