summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-281-2/+2
| | | | Should have been part of !13004.
* Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-281-1/+3
| | | | This matches the behavior of the /issues endpoint.
* Add top-level /merge_requests API endpointToon Claes2017-07-271-31/+64
| | | | | | | And add support for additional query parameters: - `author_id`: Returns merge requests created by the given user `id` - `assignee_id`: Returns merge requests assigned to the given user `id` - `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
* Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-272-13/+52
| | | | Closes gitaly#411
* Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher2017-07-271-23/+0
|\ | | | | | | | | Remove GitLab custom failure app for Devise See merge request !13136
| * Remove GitLab custom fealure app for deviseValery Sizov2017-07-271-23/+0
| |
* | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-274-1/+176
|\ \ | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546
| * | optimize query, only select relevant db columnsAlexis Reigel2017-07-271-0/+1
| | |
| * | store gpg user name and email on the signatureAlexis Reigel2017-07-272-8/+19
| | |
| * | extract common methodAlexis Reigel2017-07-271-13/+9
| | |
| * | also update gpg_signatures when gpg_key is nullAlexis Reigel2017-07-271-1/+1
| | |
| * | remove duplicate statementAlexis Reigel2017-07-271-4/+0
| | |
| * | simplify fetching of commitAlexis Reigel2017-07-271-3/+1
| | |
| * | fix memoizationAlexis Reigel2017-07-271-2/+2
| | |
| * | we need to update the gpg_key as wellAlexis Reigel2017-07-271-1/+2
| | |
| * | update ruggedAlexis Reigel2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the rugged versions up to 0.26.0b3 had a bug concerning the signature extraction. The extracted signature was not always the same, probably due to a buffer (overflow) issue in libgit. see https://github.com/libgit2/rugged/issues/608
| * | need to wrap the raw commit in a commit modelAlexis Reigel2017-07-271-1/+2
| | |
| * | no need for passing parameterAlexis Reigel2017-07-271-4/+4
| | | | | | | | | | | | we introduced memoizing, so it's safe to call the method multiple times.
| * | update invalid gpg signatures when key is createdAlexis Reigel2017-07-271-0/+19
| | |
| * | allow updating of gpg signature through gpg commitAlexis Reigel2017-07-271-1/+13
| | |
| * | memoize verified_signature callAlexis Reigel2017-07-271-8/+17
| | |
| * | store gpg_key_primary_keyid for unknown gpg keysAlexis Reigel2017-07-271-2/+4
| | | | | | | | | | | | | | | we need to store the keyid to be able to update the signature later in case the missing key is added later.
| * | move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | as we write the cache in the gpg commit class already the read should also happen there. This also removes all logic from the main commit class, which just proxies the call to the Gpg::Commit now.
| * | gpg signature is only valid when key is verifiedAlexis Reigel2017-07-271-1/+1
| | |
| * | bail if the commit has no signatureAlexis Reigel2017-07-271-2/+4
| | |
| * | cache the gpg commit signatureAlexis Reigel2017-07-271-0/+51
| | | | | | | | | | | | | | | we store the result of the gpg commit verification in the db because the gpg verification is an expensive operation.
| * | verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-271-0/+8
| | |
| * | add primary keyid attribute to gpg keysAlexis Reigel2017-07-271-0/+12
| | |
| * | don't sync to keychain fileAlexis Reigel2017-07-271-18/+0
| | |
| * | remove gpg from keychain when user's email changesAlexis Reigel2017-07-271-1/+3
| | |
| * | move current keychain methods to namespaceAlexis Reigel2017-07-271-8/+8
| | |
| * | email handling for gpg keysAlexis Reigel2017-07-271-0/+20
| | |
| * | add / remove gpg keys to / from system keychainAlexis Reigel2017-07-271-0/+8
| | |
| * | extract gpg functionality to lib classAlexis Reigel2017-07-271-0/+32
| | |
| * | commit signature with specAlexis Reigel2017-07-271-1/+6
| | |
| * | Prototype key verificationKevin O'Connor2017-07-271-0/+4
| | |
* | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵Douwe Maan2017-07-273-43/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080
| * | | add comment explaining use of shell commands and file operations in the same ↵Pawel Chojnacki2017-07-271-0/+7
| | | | | | | | | | | | | | | | methods
| * | | Remove unnecessary begin/endpawel/ensure_temp_files_are_deleted_in_fs_metrics-35457Pawel Chojnacki2017-07-261-6/+4
| | | |
| * | | use `.zero?` instead of `== 0`Pawel Chojnacki2017-07-261-4/+4
| | | |
| * | | Stop abusing subject to store results,Pawel Chojnacki2017-07-261-27/+37
| | | | | | | | | | | | | | | | + add helper methods to cleanup fs_shards metrics
| * | | Fix redis check with_timing method usagePawel Chojnacki2017-07-251-8/+7
| | | |
| * | | Add Changelog about temp file removal fixPawel Chojnacki2017-07-251-1/+0
| | | | | | | | | | | | | | | | + remove whitespace
| * | | Ensure test files are deleted after testsPawel Chojnacki2017-07-252-28/+45
| | | |
* | | | Merge branch 'rc/fix-branches-api-endpoint' into 'master'Sean McGivern2017-07-272-8/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix the `/projects/:id/repository/branches endpoint` to handle dots in the branch name when the project full patch contains a `/` See merge request !13115
| * | | | DRY the branches API requirements definitionRémy Coutable2017-07-272-5/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix the /projects/:id/repository/branches endpoint to handle dots in the ↵Rémy Coutable2017-07-271-7/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | branch name when the project full patch contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'feature/backup-custom-path' into 'master'Rémy Coutable2017-07-271-14/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Support custom directory in gitlab:backup:create task See merge request !12984
| * | | | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-271-14/+28
| |/ / /
* | | | Merge branch 'assets-task-compile-langs' into 'master'Rubén Dávila2017-07-271-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Compile JS lang files before webpack compile Closes #35615 See merge request !13122