Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-logging | Stan Hu | 2017-09-07 | 3 | -9/+21 |
| | |||||
* | Fix Rubocop failures in API logger | Stan Hu | 2017-09-07 | 2 | -4/+5 |
| | |||||
* | Add JSON logger in `log/api_json.log` for Grape API endpoints | Stan Hu | 2017-09-06 | 2 | -0/+17 |
| | | | | Closes #36189 | ||||
* | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master' | Sean McGivern | 2017-09-06 | 1 | -18/+72 |
|\ | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909 | ||||
| * | Refactor table of contents building | Robert Speicher | 2017-09-06 | 1 | -19/+11 |
| | | |||||
| * | Refactor `HeaderNode#find_parent` | Robert Speicher | 2017-09-06 | 1 | -6/+7 |
| | | | | | | | | | | Now the instance variable assignment is all contained within `#initialize`, and the `children.push` behavior is more explicit. | ||||
| * | Refactor TableOfContentsFilter's nested table of contents | Robert Speicher | 2017-09-06 | 1 | -42/+64 |
| | | | | | | | | Most of the logic is now self-contained within the `HeaderNode` class. | ||||
| * | Fix indentation level in Wiki's TOC items to regard header level | Akihiro Nakashima | 2017-09-06 | 1 | -4/+43 |
| | | |||||
* | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-object | Robert Speicher | 2017-09-06 | 4 | -14/+67 |
|\ \ | | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864 | ||||
| * | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitaly | Ahmad Sherif | 2017-09-06 | 4 | -14/+67 |
| | | | |||||
* | | | Merge branch ↵ | Douwe Maan | 2017-09-06 | 3 | -1/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762 | ||||
| * | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list | Tiago Botelho | 2017-09-06 | 4 | -8/+16 |
| | | | | |||||
| * | | | Adds CommitDescriptionRenderer | Tiago Botelho | 2017-09-06 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 1 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902 | ||||
| * | | | WIP: refactor the first-contributor to Issuable | micael.bergeron | 2017-09-06 | 1 | -1/+5 |
| |/ / | | | | | | | | | | | | | | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes | ||||
* | | | Merge branch 'url-sanitizer-fixes' into 'master' | Douwe Maan | 2017-09-06 | 1 | -6/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083 | ||||
| * | | | Remove blank passwords from sanitized URLs | Nick Thomas | 2017-09-06 | 1 | -3/+10 |
| | | | | |||||
| * | | | Backport EE fixes to Gitlab::UrlSanitizer to CE | Nick Thomas | 2017-09-06 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 7 | -197/+279 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027 | ||||
| * | | | | Revert moving authorization hook in jobs APIfeature/gb/download-single-job-artifact-using-api | Grzegorz Bizon | 2017-09-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵ | Grzegorz Bizon | 2017-09-06 | 33 | -220/+1020 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits) | ||||
| * | | | | | Remove unneeded string interpolation from entry class | Grzegorz Bizon | 2017-09-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Respond with a bad request if artifact path is invalid | Grzegorz Bizon | 2017-09-06 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Extract job artifacts API code to a separate file | Grzegorz Bizon | 2017-09-06 | 4 | -99/+99 |
| | | | | | | |||||
| * | | | | | Do not require API authentication if artifacts are public | Grzegorz Bizon | 2017-09-05 | 1 | -36/+43 |
| | | | | | | |||||
| * | | | | | Do not use artifacts metadata to access single artifact | Grzegorz Bizon | 2017-09-05 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Make it explicit that workhorse needs artifact path | Grzegorz Bizon | 2017-09-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Extract a class that represents artifacts file path | Grzegorz Bizon | 2017-09-05 | 2 | -122/+173 |
| | | | | | | |||||
| * | | | | | Use API helper to send artifact file through Workhorse | Grzegorz Bizon | 2017-09-05 | 2 | -1/+5 |
| | | | | | | |||||
| * | | | | | Add API endpoint for downloading single job artifact | Grzegorz Bizon | 2017-09-04 | 1 | -0/+19 |
| | | | | | | |||||
* | | | | | | Merge branch '35942_api_binary_encoding' into 'master' | Sean McGivern | 2017-09-06 | 5 | -12/+38 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038 | ||||
| * | | | | | | remove useless comment | micael.bergeron | 2017-09-06 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | renames ambiguous methods and add spec | micael.bergeron | 2017-09-06 | 3 | -7/+9 |
| | | | | | | | |||||
| * | | | | | | fix refactoring error with Blob.binary? | micael.bergeron | 2017-09-06 | 3 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove some lint | ||||
| * | | | | | | revert to using a simple representation | micael.bergeron | 2017-09-06 | 4 | -22/+25 |
| | | | | | | | |||||
| * | | | | | | wip: fake its a binary diff | micael.bergeron | 2017-09-06 | 4 | -7/+30 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Profile updates from providers | Alexander Keramidas | 2017-09-06 | 4 | -16/+39 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'gitaly-shell-redis-2' into 'master' | Sean McGivern | 2017-09-06 | 2 | -1/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Internal API changes to decouple redis from Shell Closes gitaly#520 See merge request !13971 | ||||
| * | | | | Implement /internal/pre-receive for shell operations | Alejandro Rodríguez | 2017-09-05 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Return a value to check if redis is available on /internal/check | Alejandro Rodríguez | 2017-09-05 | 2 | -1/+11 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Douwe Maan | 2017-09-06 | 4 | -3/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | ||||
| * | | | | | change collapse to resolve and comments to discussions | Ashley Dumaine | 2017-09-06 | 4 | -6/+6 |
| | | | | | | |||||
| * | | | | | Add functionality to collapse outdated diff comments regardless of ↵ | Ashley Dumaine | 2017-09-06 | 4 | -3/+8 |
| | |_|/ / | |/| | | | | | | | | | | | | | discussion resolution | ||||
* | | | | | Merge branch 'fix/import-export-performance' into 'master' | Douwe Maan | 2017-09-06 | 3 | -27/+55 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Improve Import/Export memory use and performance Closes #35389 and #26556 See merge request !13957 | ||||
| * | | | | refactored code | James Lopez | 2017-09-06 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | refactor code based on feedbackfix/import-export-performance | James Lopez | 2017-09-06 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | fix spec failures | James Lopez | 2017-09-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | small refactor | James Lopez | 2017-09-06 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | fix specs | James Lopez | 2017-09-05 | 1 | -6/+4 |
| | | | | | |||||
| * | | | | refactor code a little | James Lopez | 2017-09-05 | 1 | -3/+12 |
| | | | | |