| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master' | Kamil Trzciński | 2017-11-14 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216 | ||||
| | * | Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new | Shinya Maeda | 2017-11-07 | 6 | -12/+25 |
| | |\ | |||||
| | * | | Add doc. Fix spec. Add erase_build in protected_ref rule | Shinya Maeda | 2017-11-07 | 2 | -2/+0 |
| | | | | |||||
| | * | | Fix spec. Revert update check. | Shinya Maeda | 2017-11-06 | 2 | -0/+2 |
| | | | | |||||
| | * | | Do not allow jobs to be erased | Shinya Maeda | 2017-11-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add administrative endpoint to list all pages domains | Travis Miller | 2017-11-13 | 3 | -3/+48 |
| | | | | |||||
| * | | | Add Gitlab::Utils::StrongMemoize | Lin Jen-Shin (godfat) | 2017-11-13 | 1 | -3/+5 |
| | | | | |||||
| * | | | Add /groups/:id/subgroups endpoint to API | Winnie Hellmann | 2017-11-09 | 1 | -22/+44 |
| | | | | |||||
| * | | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master' | Rémy Coutable | 2017-11-09 | 1 | -0/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix acceptance of username for Mattermost service update Closes #39895 See merge request gitlab-org/gitlab-ce!15275 | ||||
| | * | | | Fix acceptance of username for Mattermost service update via API | Mark Fletcher | 2017-11-08 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch '36099-api-responses-missing-x-content-type-options-header' ↵ | Douwe Maan | 2017-11-08 | 1 | -1/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into '10-1-stable' Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2211 (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79) e087e075 Include X-Content-Type-Options (XCTO) header into API responses | ||||
| * | | | Merge branch 'fix-issues-api-list-performance' into 'master' | Stan Hu | 2017-11-08 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fail when issuable_meta_data is called on an unlimited collection Closes #39845 See merge request gitlab-org/gitlab-ce!15249 | ||||
| | * | | | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performance | Sean McGivern | 2017-11-07 | 1 | -6/+6 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be called with an array, or a relation: 1. Arrays always have a limited amount of values, so that's fine. 2. If the relation does not have a limit value applied, then we will load every single object in that collection, and prevent N+1 queries for the metadata for that. But that's wrong, because we should never call this without an explicit limit set. So we raise in that case, and this commit will see which specs fail. The only failing specs here were the issues API specs, and the specs for IssuableMetadata itself, and both have been addressed. | ||||
| * | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-id | Douwe Maan | 2017-11-08 | 2 | -2/+2 |
| |/ / | | | | | | | all the indexes available to us | ||||
| * | | Merge branch ↵ | Douwe Maan | 2017-11-07 | 3 | -11/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master' Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint See merge request gitlab-org/gitlab-ce!15215 | ||||
| | * | | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request | Rémy Coutable | 2017-11-06 | 1 | -4/+1 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Improve performance of the /projects/:id/repository/branches API endpoint | Rémy Coutable | 2017-11-06 | 3 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | Mitigate a N+1 requests to Gitaly problem. Still one left. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master' | Rémy Coutable | 2017-11-07 | 3 | -1/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593 | ||||
| | * | | | Support custom attributes on groups | Markus Koller | 2017-11-06 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Support custom attributes on projects | Markus Koller | 2017-11-06 | 2 | -0/+3 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master' | Rémy Coutable | 2017-11-07 | 1 | -0/+4 |
| |\ \ \ | |_|/ |/| | | | | | | | | Add changes_count to the merge requests API See merge request gitlab-org/gitlab-ce!15178 | ||||
| | * | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-api | Sean McGivern | 2017-11-03 | 1 | -0/+4 |
| | |/ | | | | | | | | | | | This returns the `real_size` of the MR's diff, which is a string indicating the number of changes. If the diff overflows after _n_ files, the string will be `$n+`. | ||||
| * | | Expose `duration` in Job API entity | Mehdi Lahmam | 2017-11-05 | 1 | -0/+1 |
| |/ | | | | Closes #35794. | ||||
| * | Update specs for sudo behavior | Douwe Maan | 2017-11-02 | 1 | -5/+2 |
| | | |||||
| * | Add sudo API scope | Douwe Maan | 2017-11-02 | 2 | -74/+50 |
| | | |||||
| * | Remove authentication using user.private_token | Douwe Maan | 2017-11-02 | 1 | -16/+6 |
| | | |||||
| * | Remove private_token from API user entity | Douwe Maan | 2017-11-02 | 2 | -7/+1 |
| | | |||||
| * | Remove Session API | Douwe Maan | 2017-11-02 | 2 | -21/+0 |
| | | |||||
| * | Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' ↵ | Rémy Coutable | 2017-10-31 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | into 'master' Fix namespacing for MergeWhenPipelineSucceedsService in MR API Closes #39619 See merge request gitlab-org/gitlab-ce!15088 | ||||
| | * | Fix namespacing for MergeWhenPipelineSucceedsService in MR API | Mark Fletcher | 2017-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'add-packagist-project-service' into 'master' | Kamil Trzciński | 2017-10-31 | 2 | -0/+41 |
| |\ \ | |/ |/| | | | | | Add Packagist project service See merge request gitlab-org/gitlab-ce!14493 | ||||
| | * | Add Packagist project service | Matt Coleman | 2017-10-13 | 2 | -0/+41 |
| | | | |||||
| * | | Merge branch 'api-configure-jira' into 'master' | Douwe Maan | 2017-10-26 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025 | ||||
| | * | | Validate username/pw for Jiraservice, require them in the API | Robert Schilling | 2017-10-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add pages domains API implementation | Travis Miller | 2017-10-22 | 3 | -0/+122 |
| | | | | |||||
| * | | | Add pages domains API entities | Travis Miller | 2017-10-22 | 1 | -0/+17 |
| |/ / | |||||
| * | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master' | Rémy Coutable | 2017-10-18 | 1 | -8/+14 |
| |\ \ | | | | | | | | | | | | | | | | | | | Get Project Branch API shows an helpful error message on invalid refname Closes #37032 See merge request gitlab-org/gitlab-ce!14884 | ||||
| | * | | Get Project Branch API shows an helpful error message on invalid refname | Jacopo | 2017-10-18 | 1 | -8/+14 |
| | | | | | | | | | | | | | | | | In API v4 when requesting a branch with an invalid refname shows an helpful error message: 'The branch refname is invalid'. | ||||
| * | | | Merge branch 'sha-handling' into 'master' | Douwe Maan | 2017-10-16 | 6 | -22/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Adds requirements that supports anything in sha params Closes #26561 and #2709 See merge request gitlab-org/gitlab-ce!14462 | ||||
| | * | | | Adds requirements that supports anything in sha params | Guilherme Vieira | 2017-10-12 | 6 | -22/+21 |
| | | | | | |||||
| * | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | Having a distinct class just for that was a bit overkill | ||||
| * | | | | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that. | ||||
| * | | | | Move Gitlab::Diff::LineCode to module Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 2 | -2/+2 |
| | |_|/ |/| | | |||||
| * | | | Move all API authentication code to APIGuard | Douwe Maan | 2017-10-12 | 2 | -92/+93 |
| | |/ |/| | |||||
| * | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 4 | -2/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | ||||
| | * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Jarka Kadlecova | 2017-10-03 | 7 | -33/+150 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb | ||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-20 | 4 | -7/+30 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | Create system notes for MR too, improve doc + clean up code | Jarka Kadlecova | 2017-09-14 | 2 | -8/+3 |
| | | | | | | |||||
| | * | | | | Support discussion lock in the API | Jarka Kadlecova | 2017-09-14 | 4 | -2/+14 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |