summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | refactor users update serviceJames Lopez2017-09-283-3/+3
| | | | | |
| * | | | | refactor services to match EE signatureJames Lopez2017-09-283-7/+7
| |/ / / /
| * | | | Merge branch ↵Rémy Coutable2017-09-271-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418
| | * | | | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-methodTiago Botelho2017-09-261-2/+2
| | |/ / /
| * | | | Merge branch 'dm-simple-project-avatar-url' into 'master'Rémy Coutable2017-09-261-5/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose avatar_url when requesting list of projects from API with simple=true See merge request gitlab-org/gitlab-ce!14498
| | * | | | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-urlDouwe Maan2017-09-261-5/+6
| | |/ / /
| * | | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-261-0/+1
| |/ / / | | | | | | | | | | | | Closes #35692.
* | | | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-2/+2
| | | |
* | | | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-231-2/+0
|/ / / | | | | | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* | | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-201-4/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
| * | | Add an API endpoint to determine the forks of a projectMark Fletcher2017-09-201-4/+19
| | | |
* | | | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-192-2/+8
|/ / /
* | | fix #35290 Make read-only API for public merge requests available without ↵haseeb2017-09-181-1/+2
| | | | | | | | | | | | authentication
* | | Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-181-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316
| * | Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-161-0/+1
| |/
* | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
|/
* Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-131-1/+0
|\ | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245
| * Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responsesStan Hu2017-09-131-1/+0
| |
* | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-1/+1
| |/
* | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-1/+1
|/ | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-1/+1
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-072-2/+7
|
* Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+11
|\ | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-071-2/+2
| |
| * Fix Rubocop failures in API loggerStan Hu2017-09-071-3/+5
| |
| * Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+9
| | | | | | | | Closes #36189
View Lorry Controller Status