summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [ci-skip] spec for an instance method35942_api_binary_encodingmicael.bergeron2017-09-061-1/+1
|
* remove useless commentmicael.bergeron2017-09-061-2/+0
|
* added changelog entrymicael.bergeron2017-09-061-0/+3
|
* renames ambiguous methods and add specmicael.bergeron2017-09-064-7/+15
|
* fix refactoring error with Blob.binary?micael.bergeron2017-09-063-10/+10
| | | | remove some lint
* add .json_safe_diff specmicael.bergeron2017-09-061-0/+19
|
* revert to using a simple representationmicael.bergeron2017-09-064-22/+25
|
* wip: fake its a binary diffmicael.bergeron2017-09-064-7/+30
|
* Merge branch 'docs/cleanup-projects-api' into 'master'Achilleas Pipinellis2017-09-061-187/+40
|\ | | | | | | | | Clean up projects API docs See merge request !14071
| * Clean up projects API docsdocs/cleanup-projects-apiAchilleas Pipinellis2017-09-061-187/+40
| |
* | Merge branch 'test-wait-gitaly-boot' into 'master'Rémy Coutable2017-09-061-0/+18
|\ \ | | | | | | | | | | | | Wait for gitaly to boot during tests See merge request !14051
| * | Wait for gitaly to boot during teststest-wait-gitaly-bootJacob Vosmaer2017-09-061-0/+18
| | |
* | | Merge branch ↵Douwe Maan2017-09-0629-52/+347
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
| * | | Fix note resolution specsSean McGivern2017-09-063-10/+16
| | | |
| * | | Add author and MR to changelogSean McGivern2017-09-061-2/+2
| | | |
| * | | Tidy up projects API specsSean McGivern2017-09-062-40/+23
| | | |
| * | | Resolve outdated diff discussions on pushSean McGivern2017-09-0616-102/+212
| | | |
| * | | Fix migrationSean McGivern2017-09-062-12/+4
| | | |
| * | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-0619-83/+85
| | | |
| * | | add unit tests for new collapse_outdated_diff_comments toggleAshley Dumaine2017-09-063-0/+132
| | | |
| * | | Add functionality to collapse outdated diff comments regardless of ↵Ashley Dumaine2017-09-0616-4/+74
| | | | | | | | | | | | | | | | discussion resolution
* | | | Merge branch 'fix/import-export-performance' into 'master'Douwe Maan2017-09-067-37/+77
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Import/Export memory use and performance Closes #35389 and #26556 See merge request !13957
| * | | | refactored codeJames Lopez2017-09-061-4/+3
| | | | |
| * | | | refactor code based on feedbackfix/import-export-performanceJames Lopez2017-09-062-4/+2
| | | | |
| * | | | fix spec failuresJames Lopez2017-09-061-1/+1
| | | | |
| * | | | small refactorJames Lopez2017-09-061-5/+5
| | | | |
| * | | | add changelogJames Lopez2017-09-051-0/+5
| | | | |
| * | | | fix specsJames Lopez2017-09-052-8/+6
| | | | |
| * | | | fix typoJames Lopez2017-09-051-1/+1
| | | | |
| * | | | refactor code a littleJames Lopez2017-09-052-4/+13
| | | | |
| * | | | fix export performance of CI buildsJames Lopez2017-09-054-11/+17
| | | | |
| * | | | started refactoring readerJames Lopez2017-09-051-1/+3
| | | | |
| * | | | some more refactoringJames Lopez2017-09-052-18/+5
| | | | |
| * | | | some more refactoringJames Lopez2017-09-051-17/+15
| | | | |
| * | | | enable AR caching, refactor tree hash loopJames Lopez2017-09-051-12/+27
| | | | |
| * | | | remove relation after used from the hash treeJames Lopez2017-09-051-6/+3
| | | | |
| * | | | more refactoringJames Lopez2017-09-051-3/+5
| | | | |
| * | | | some more performance refactoringJames Lopez2017-09-051-12/+33
| | | | |
| * | | | start improving memory use on I/EJames Lopez2017-09-051-3/+6
| | | | |
* | | | | Merge branch 'backstage/gb/enable-auto-retry-in-gitlab-org-pipeline' into ↵Rémy Coutable2017-09-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enable auto-retry in GitLab CI/CD pipeline Closes #37281 See merge request !14033
| * | | | | Enable auto-retry in GitLab CI/CD pipelineGrzegorz Bizon2017-09-061-0/+1
|/ / / / /
* | | | | Merge branch 'retro-kickoff' into 'master'Rémy Coutable2017-09-061-20/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update PROCESS.md to point to retro and kickoff info See merge request !14059
| * | | | | Update PROCESS.mdretro-kickoffVictor Wu2017-09-051-20/+2
| | | | | |
* | | | | | Merge branch ↵Rémy Coutable2017-09-063-4/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19650-remove-admin-section-from-search-results-if-user-doesnt-have-access' into 'master' Hide admin link from default search results for non-admins Closes #19650 See merge request !14015
| * | | | | | Hide admin link from default search results for non-adminsMark Fletcher2017-09-063-4/+32
| | | | | | |
* | | | | | | Merge branch 'clean-up-new-nav-templates' into 'master'Tim Zallmann2017-09-0676-827/+198
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up new navigation templates See merge request !13983
| * | | | | | | Clean up new navigation templatesPhil Hughes2017-09-0676-827/+198
|/ / / / / / /
* | | | | | | Merge branch 'fix-api-docs' into 'master'Sean McGivern2017-09-064-17/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong API status codes See merge request !14069
| * | | | | | | Fix wrong API status codesRobert Schilling2017-09-064-17/+7
| | | | | | | |
* | | | | | | | Merge branch 'mmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2' into 'master'Marcia Ramos2017-09-062-0/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update the docs for GPG for gpg2 - [secret key not available]" Closes #36859 See merge request !14024