Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responses | Stan Hu | 2017-09-13 | 1 | -1/+0 |
| | |||||
* | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 1 | -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-false | Ruben Davila | 2017-09-07 | 2 | -2/+7 |
| | |||||
* | Merge branch 'sh-add-grape-logging' into 'master' | Sean McGivern | 2017-09-07 | 1 | -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-logging | Stan Hu | 2017-09-07 | 1 | -2/+2 |
| | | |||||
| * | Fix Rubocop failures in API logger | Stan Hu | 2017-09-07 | 1 | -3/+5 |
| | | |||||
| * | Add JSON logger in `log/api_json.log` for Grape API endpoints | Stan Hu | 2017-09-06 | 1 | -0/+9 |
| | | | | | | | | Closes #36189 | ||||
* | | Merge branch '23079-remove-default-scope-in-sortable' into 'master' | Douwe Maan | 2017-09-07 | 6 | -5/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558 | ||||
| * | | Removes default scope from sortable23079-remove-default-scope-in-sortable | Tiago Botelho | 2017-09-07 | 6 | -5/+6 |
| | | | |||||
* | | | Merge branch ↵ | Sean McGivern | 2017-09-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619 | ||||
| * | | | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932 | ||||
| * | | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241 | ||||
* | | | Merge branch 'wiki_api' into 'master' | Grzegorz Bizon | 2017-09-07 | 4 | -0/+106 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372 | ||||
| * | | Add API support for wiki pages | blackst0ne | 2017-09-07 | 4 | -0/+106 |
| | | | |||||
* | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 4 | -73/+104 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -42/+265 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits) | ||||
| * | | | 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 |
| | | | | |||||
| * | | | 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 | 2 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038 | ||||
| * | | | | revert to using a simple representation | micael.bergeron | 2017-09-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | wip: fake its a binary diff | micael.bergeron | 2017-09-06 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | 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 | ||||
* | | | API: Add GPG key management for admins | Robert Schilling | 2017-09-05 | 1 | -0/+80 |
| | | | |||||
* | | | API: Add GPG key management | Robert Schilling | 2017-09-05 | 2 | -0/+74 |
| | | | |||||
* | | | Merge branch 'api_branches_head' into 'master' | Sean McGivern | 2017-09-05 | 1 | -10/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add branch existence check to the APIv4 branches via HEAD request Closes #37159 See merge request !13979 | ||||
| * | | | Add branch existence check to the APIv4 branches via HEAD request | blackst0ne | 2017-09-05 | 1 | -10/+15 |
| | | | | |||||
* | | | | Merge branch 'issue-api-my-reaction' into 'master' | Sean McGivern | 2017-09-05 | 2 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add my_reaction_emoji param to /issues and /merge_requests API See merge request !14016 | ||||
| * | | | | Add my_reaction_emoji param to /merge_requests API | Hiroyuki Sato | 2017-09-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add my_reaction_emoji param to /issues API | Hiroyuki Sato | 2017-09-05 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'feature/sm/34518-extend-api-pipeline-schedule-variable-new' ↵ | Kamil Trzciński | 2017-09-05 | 2 | -17/+71 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Extend API: Pipeline Schedule Variable Closes #34518 See merge request !13653 | ||||
| * | | | | Fix security breachingfeature/sm/34518-extend-api-pipeline-schedule-variable-new | Shinya Maeda | 2017-09-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Improve def pipeline_schedule with authrozation code | Shinya Maeda | 2017-09-04 | 1 | -16/+13 |
| | | | | | |||||
| * | | | | Improve by zj nice catches | Shinya Maeda | 2017-09-04 | 2 | -25/+14 |
| | | | | | |||||
| * | | | | Finish spec | Shinya Maeda | 2017-09-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add spec (Halfway) | Shinya Maeda | 2017-09-04 | 2 | -54/+51 |
| | | | | | |||||
| * | | | | Extend API: Pipeline Schedule Variable | Shinya Maeda | 2017-09-04 | 2 | -1/+72 |
| |/ / / | |||||
* | | | | Merge branch ↵ | Kamil Trzciński | 2017-09-05 | 1 | -13/+19 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master' Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest` Closes #35650 See merge request !13792 | ||||
| * | | | Use pipeline.trigger_requests.lastfix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest | Shinya Maeda | 2017-09-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix trigger_request.variables | Shinya Maeda | 2017-09-04 | 1 | -4/+2 |
| | | | | |||||
| * | | | Fix spec | Shinya Maeda | 2017-09-04 | 1 | -2/+3 |
| | | | |