summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Add settings for minimum key strength and allowed key typeNick Thomas2017-08-302-0/+7
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an amalgamation of: * Cory Hinshaw: Initial implementation !5552 * Rémy Coutable: Updates !9350 * Nick Thomas: Resolve conflicts and add ED25519 support !13712
* | | | | | | | | | | | | Merge branch 'rs-api-use-project-requirements' into 'master'Sean McGivern2017-09-0132-35/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Use defined project requirements See merge request !13960
| * | | | | | | | | | | | | API: Use defined project requirementsrs-api-use-project-requirementsRobert Schilling2017-08-3132-35/+35
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'gitaly-shell-redis' into 'master'Dmitriy Zaporozhets2017-09-012-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement /internal/post_receive unified endpoint for PostReceive tasks See merge request !13916
| * | | | | | | | | | | | | Implement /internal/post_receive unified endpoint for PostReceive tasksgitaly-shell-redisAlejandro Rodríguez2017-08-312-1/+20
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Douwe Maan2017-08-311-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37266-nomethoderror-undefined-method-current_application_settings-build-failed-30837482' into 'master' `current_application_settings` belongs on `Gitlab::CurrentSettings` Closes #37266 See merge request !13955
| * | | | | | | | | | | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* | | | | | | | | | | | fix :file_path - add requirements:Marc Siegfriedt2017-08-301-6/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into ↵Robert Speicher2017-08-303-7/+67
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add time stats to Issue and Merge Request API Closes #28453 See merge request !13335
| * | | | | | | | | | | Add time stats to issue and merge request API end pointsTravis Miller2017-08-293-13/+39
| | | | | | | | | | | |
| * | | | | | | | | | | Resolve new N+1 by adding preloads and metadata to issues end pointsTravis Miller2017-08-292-5/+39
| | | | | | | | | | | |
* | | | | | | | | | | | Don't use public_send in destroy_conditionally! helperSean McGivern2017-08-303-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we only override in two places, we could just ask for the value rather than the method name.
* | | | | | | | | | | | Merge branch '37198-api-doesn-t-respect-default-group-visibility' into 'master'Sean McGivern2017-08-301-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the default visibility level when creating a group via the API Closes #37198 See merge request !13903
| * | | | | | | | | | | | Make rubocop happy37198-api-doesn-t-respect-default-group-visibilityRobert Schilling2017-08-301-3/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Respect the default visibility level when creating a groupRobert Schilling2017-08-291-1/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'api-delete-respect-headers' into 'master'Sean McGivern2017-08-3029-83/+122
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Respect the 'If-Unmodified-Since' for delete endpoints See merge request !9621
| * | | | | | | | | | | Add a spec when ressource is not modifiedRobert Schilling2017-08-291-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Update remaining endpointsRobert Schilling2017-08-288-18/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Use commit date for branches and tagsRobert Schilling2017-08-282-8/+22
| | | | | | | | | | | |
| * | | | | | | | | | | Conditionally destroy a ressourceRobert Schilling2017-08-2823-112/+69
| | | | | | | | | | | |
| * | | | | | | | | | | API: Respect the 'If-Unmodified-Since' for delete endpointsRobert Schilling2017-08-2822-1/+72
| |/ / / / / / / / / /
* | | | | | | | | | | replace `is_runner_queue_value_latest?` with `runner_queue_value_latest?`Maxim Rydkin2017-08-291-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Refactor complicated API group finding rules into GroupsFinderNick Thomas2017-08-241-10/+2
| | | | | | | | | |
* | | | | | | | | | Allow v4 API GET requests for groups to be unauthenticatedNick Thomas2017-08-231-4/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-171-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And the link to the last page cannot be `page=0`.
* | | | | | | | | don't add next page link if current page is out of rangeJordan Patterson2017-08-171-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-165-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* | | | | | | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-164-7/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-144-7/+8
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-152-2/+2
| | | | | | | |
* | | | | | | | Fix API responses when dealing with txt filesissue_31790Felipe Artur2017-08-151-0/+3
| | | | | | | |
* | | | | | | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-142-0/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | | | | | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
| * | | | | | | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| | | | | | | |
* | | | | | | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ↵Sean McGivern2017-08-111-9/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Closes #36213 See merge request !13501
| * | | | | | | Include the `is_admin` field in the `GET /users/:id` API when current user ↵Rémy Coutable2017-08-111-9/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is an admin Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-112-2/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | | | | | Migrate events into a new formatYorick Peterse2017-08-102-2/+22
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
* | | | | | | Show error message for API 500 error in tests, andLin Jen-Shin2017-08-111-1/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | document have_gitlab_http_status
* | | | | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-2/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-081-16/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
| * | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Expose noteable_iid in Notesue4452017-08-081-0/+6
| | | | | |
* | | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵Rémy Coutable2017-08-082-7/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'master' into ideMike Greiling2017-08-075-20/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * \ \ \ \ Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-073-0/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
| | * | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-043-0/+57
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '32300__expose_more_attributes' into 'master'Rémy Coutable2017-08-071-14/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Expose more attributes to unauthenticated GET /projects/:id See merge request !13283
| | * | | | Expose more attributes to unauthenticated GET /projects/:idTony2017-08-031-14/+11
| | | | | |