summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-074-0/+106
|\
| * Add API support for wiki pagesblackst0ne2017-09-074-0/+106
* | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-7/+10
* | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-061-18/+72
|\ \
| * | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| * | Refactor `HeaderNode#find_parent`Robert Speicher2017-09-061-6/+7
| * | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-061-42/+64
| * | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-061-4/+43
* | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-064-14/+67
|\ \ \
| * | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-064-14/+67
* | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-063-1/+16
|\ \ \ \
| * | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-064-8/+16
| * | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
* | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-1/+5
| |/ / /
* | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-6/+13
|\ \ \ \
| * | | | Remove blank passwords from sanitized URLsNick Thomas2017-09-061-3/+10
| * | | | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-061-6/+6
* | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-067-197/+279
|\ \ \ \ \
| * | | | | Revert moving authorization hook in jobs APIfeature/gb/download-single-job-artifact-using-apiGrzegorz Bizon2017-09-061-2/+2
| * | | | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-0633-220/+1020
| |\ \ \ \ \
| * | | | | | Remove unneeded string interpolation from entry classGrzegorz Bizon2017-09-061-1/+1
| * | | | | | Respond with a bad request if artifact path is invalidGrzegorz Bizon2017-09-062-2/+2
| * | | | | | Extract job artifacts API code to a separate fileGrzegorz Bizon2017-09-064-99/+99
| * | | | | | Do not require API authentication if artifacts are publicGrzegorz Bizon2017-09-051-36/+43
| * | | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-3/+4
| * | | | | | Make it explicit that workhorse needs artifact pathGrzegorz Bizon2017-09-051-2/+2
| * | | | | | Extract a class that represents artifacts file pathGrzegorz Bizon2017-09-052-122/+173
| * | | | | | Use API helper to send artifact file through WorkhorseGrzegorz Bizon2017-09-052-1/+5
| * | | | | | Add API endpoint for downloading single job artifactGrzegorz Bizon2017-09-041-0/+19
* | | | | | | Merge branch '35942_api_binary_encoding' into 'master'Sean McGivern2017-09-065-12/+38
|\ \ \ \ \ \ \
| * | | | | | | remove useless commentmicael.bergeron2017-09-061-2/+0
| * | | | | | | renames ambiguous methods and add specmicael.bergeron2017-09-063-7/+9
| * | | | | | | fix refactoring error with Blob.binary?micael.bergeron2017-09-063-10/+10
| * | | | | | | revert to using a simple representationmicael.bergeron2017-09-064-22/+25
| * | | | | | | wip: fake its a binary diffmicael.bergeron2017-09-064-7/+30
| | |_|_|/ / / | |/| | | | |
* | | | | | | Profile updates from providersAlexander Keramidas2017-09-064-16/+39
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'gitaly-shell-redis-2' into 'master'Sean McGivern2017-09-062-1/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implement /internal/pre-receive for shell operationsAlejandro Rodríguez2017-09-051-0/+8
| * | | | | Return a value to check if redis is available on /internal/checkAlejandro Rodríguez2017-09-052-1/+11
* | | | | | Merge branch 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsi...Douwe Maan2017-09-064-3/+8
|\ \ \ \ \ \
| * | | | | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-064-6/+6
| * | | | | | Add functionality to collapse outdated diff comments regardless of discussion...Ashley Dumaine2017-09-064-3/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/import-export-performance' into 'master'Douwe Maan2017-09-063-27/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | refactored codeJames Lopez2017-09-061-4/+3
| * | | | | refactor code based on feedbackfix/import-export-performanceJames Lopez2017-09-061-3/+1
| * | | | | fix spec failuresJames Lopez2017-09-061-1/+1
| * | | | | small refactorJames Lopez2017-09-061-5/+5
| * | | | | fix specsJames Lopez2017-09-051-6/+4
| * | | | | refactor code a littleJames Lopez2017-09-051-3/+12