summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch ↵Douwe Maan2017-11-073-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-requestRémy Coutable2017-11-061-4/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-063-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 Coutable2017-11-073-1/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593
| | * | | Support custom attributes on groupsMarkus Koller2017-11-061-1/+8
| | | | |
| | * | | Support custom attributes on projectsMarkus Koller2017-11-062-0/+3
| | | |/ | | |/|
| * | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-071-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-apiSean McGivern2017-11-031-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+`.
* | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0628-267/+508
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1723 commits) Resolve "Editor icons" Refactor issuable destroy action Ignore routes matching legacy_*_redirect in route specs Gitlab::Git::RevList and LfsChanges use lazy popen Gitlab::Git::Popen can lazily hand output to a block Merge branch 'master-i18n' into 'master' Remove unique validation from external_url in Environment Expose `duration` in Job API entity Add TimeCop freeze for DST and Regular time Harcode project visibility update a changelog Put a condition to old migration that adds fast_forward column to MRs Expose project visibility as CI variable fix flaky tests by removing unneeded clicks and focus actions fix flaky test in gfm_autocomplete_spec.rb Use Gitlab::Git operations for repository mirroring Encapsulate git operations for mirroring in Gitlab::Git Create a Wiki Repository's raw_repository properly Add `Gitlab::Git::Repository#fetch` command Fix Gitlab::Metrics::System#real_time and #monotonic_time doc ...
| * | Expose `duration` in Job API entityMehdi Lahmam2017-11-051-0/+1
| |/ | | | | | | Closes #35794.
| * Update specs for sudo behaviorDouwe Maan2017-11-021-5/+2
| |
| * Add sudo API scopeDouwe Maan2017-11-022-74/+50
| |
| * Remove authentication using user.private_tokenDouwe Maan2017-11-021-16/+6
| |
| * Remove private_token from API user entityDouwe Maan2017-11-022-7/+1
| |
| * Remove Session APIDouwe Maan2017-11-022-21/+0
| |
| * Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' ↵Rémy Coutable2017-10-311-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 APIMark Fletcher2017-10-301-1/+1
| | |
| * | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-312-0/+41
| |\ \ | | |/ | |/| | | | | | | Add Packagist project service See merge request gitlab-org/gitlab-ce!14493
| | * Add Packagist project serviceMatt Coleman2017-10-132-0/+41
| | |
| * | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-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 APIRobert Schilling2017-10-241-2/+2
| | | |
| * | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| | | |
| * | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
| |/ /
| * | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-181-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 refnameJacopo2017-10-181-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 Maan2017-10-166-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 paramsGuilherme Vieira2017-10-126-22/+21
| | | | |
| * | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-122-2/+2
| | | | | | | | | | | | | | | | | | | | Having a distinct class just for that was a bit overkill
| * | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-122-2/+2
| | | | | | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-122-2/+2
| | |_|/ | |/| |
| * | | Move all API authentication code to APIGuardDouwe Maan2017-10-122-92/+93
| | |/ | |/|
| * | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-064-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 Kadlecova2017-10-037-33/+150
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| | * \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-204-7/+30
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-181-1/+1
| | |\ \ \
| | * | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-142-8/+3
| | | | | |
| | * | | | Support discussion lock in the APIJarka Kadlecova2017-09-144-2/+14
| | | | | |
| * | | | | Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send API parameters as extra data for sentry errors See merge request gitlab-org/gitlab-ce!14644
| | * | | | | Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-051-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into ↵Douwe Maan2017-10-0520-116/+229
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| | * | | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-0514-79/+78
| | | | | | |
| | * | | | | Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-031-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Hide CI section markers from job trace See merge request gitlab-org/gitlab-ce!14393
| | | * | | | Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-031-0/+1
| | | | |_|/ | | | |/| |
| | * | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-021-3/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API context Closes #38571 See merge request gitlab-org/gitlab-ce!14580
| | | * | | | Ensure no exception is raised when Raven tries to get the current user in ↵38571-fix-exception-in-raven-reportRémy Coutable2017-09-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API context Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-291-0/+7
| | |/ / / /
| | * | | | Support custom attributes on usersMarkus Koller2017-09-283-0/+84
| | | | | |
| | * | | | Merge branch 'dm-api-unauthorized' into 'master'Sean McGivern2017-09-282-16/+38
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure API responds with 401 when invalid authentication info is provided Closes #38438 See merge request gitlab-org/gitlab-ce!14525
| | | * | | | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorizedDouwe Maan2017-09-282-16/+38
| | | | | | |
| | * | | | | refactor emails servicerefactor-servicesJames Lopez2017-09-281-4/+4
| | | | | | |
View Lorry Controller Status