Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 3 | -4/+14 |
|\ | | | | | | | | | Skip OAuth authorization for trusted applications See merge request !13061 | ||||
| * | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 3 | -4/+14 |
| | | |||||
* | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 17 | -0/+1105 |
|\ \ | |/ |/| | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| * | remove log statements from workers | Alexis Reigel | 2017-07-27 | 2 | -21/+0 |
| | | |||||
| * | improve gpg key validation | Alexis Reigel | 2017-07-27 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | when omitting the end part of the key ('-----END PGP PUBLIC KEY BLOCK-----') the error message was not about the key anymore, but about the missing fingerprint and primary_keyid, which was confusing for the user. the new validation checks that the end also matches the expected format. | ||||
| * | optimize query, only select relevant db columns | Alexis Reigel | 2017-07-27 | 1 | -11/+53 |
| | | |||||
| * | validate the foreign_key instead of the relation | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | |||||
| * | simplify nil handling | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
| | | |||||
| * | fetch gpg signature badges by ajax | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
| | | |||||
| * | use short project path helpers | Alexis Reigel | 2017-07-27 | 1 | -6/+6 |
| | | |||||
| * | swap user's name and the user's username | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | |||||
| * | show gpg key's user info when no profile exists | Alexis Reigel | 2017-07-27 | 1 | -3/+20 |
| | | |||||
| * | store gpg user name and email on the signature | Alexis Reigel | 2017-07-27 | 4 | -9/+45 |
| | | |||||
| * | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 2 | -0/+43 |
| | | | | | | | | | | other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits. | ||||
| * | generate gpg signature on push | Alexis Reigel | 2017-07-27 | 2 | -0/+79 |
| | | |||||
| * | improve spacing / alignments in gpg popup | Alexis Reigel | 2017-07-27 | 1 | -7/+7 |
| | | |||||
| * | extract common method | Alexis Reigel | 2017-07-27 | 1 | -8/+21 |
| | | |||||
| * | also update gpg_signatures when gpg_key is null | Alexis Reigel | 2017-07-27 | 1 | -15/+55 |
| | | |||||
| * | simplify fetching of commit | Alexis Reigel | 2017-07-27 | 2 | -1/+14 |
| | | |||||
| * | validate presence of user on gpg_key | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| | | |||||
| * | use hash instead of 2d array | Alexis Reigel | 2017-07-27 | 1 | -4/+4 |
| | | |||||
| * | use sign_in instead of login_with | Alexis Reigel | 2017-07-27 | 1 | -3/+3 |
| | | |||||
| * | remove the :gpg rspec tag | Alexis Reigel | 2017-07-27 | 4 | -12/+12 |
| | | | | | | | | | | since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore. | ||||
| * | use updated gitlab-test repo for signed commits | Alexis Reigel | 2017-07-27 | 2 | -19/+6 |
| | | |||||
| * | extract variable | Alexis Reigel | 2017-07-27 | 1 | -6/+7 |
| | | |||||
| * | add gpg commit popover badges | Alexis Reigel | 2017-07-27 | 1 | -0/+25 |
| | | |||||
| * | perform signature update in sidekiq worker | Alexis Reigel | 2017-07-27 | 2 | -4/+46 |
| | | |||||
| * | update features specs for gpg commits | Alexis Reigel | 2017-07-27 | 1 | -13/+38 |
| | | |||||
| * | need to wrap the raw commit in a commit model | Alexis Reigel | 2017-07-27 | 1 | -2/+7 |
| | | |||||
| * | update invalid gpg signatures when email changes | Alexis Reigel | 2017-07-27 | 2 | -25/+81 |
| | | |||||
| * | update invalid gpg signatures when key is created | Alexis Reigel | 2017-07-27 | 2 | -0/+61 |
| | | |||||
| * | memoize verified_signature call | Alexis Reigel | 2017-07-27 | 1 | -6/+6 |
| | | |||||
| * | store gpg_key_primary_keyid for unknown gpg keys | Alexis Reigel | 2017-07-27 | 2 | -1/+2 |
| | | | | | | | | | | 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::Commit | Alexis Reigel | 2017-07-27 | 2 | -94/+49 |
| | | | | | | | | | | | | | | | | 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 verified | Alexis Reigel | 2017-07-27 | 2 | -2/+42 |
| | | |||||
| * | bail if the commit has no signature | Alexis Reigel | 2017-07-27 | 1 | -0/+6 |
| | | |||||
| * | cache the gpg commit signature | Alexis Reigel | 2017-07-27 | 2 | -23/+118 |
| | | | | | | | | | | we store the result of the gpg commit verification in the db because the gpg verification is an expensive operation. | ||||
| * | gpg signature model for gpg verification caching | Alexis Reigel | 2017-07-27 | 1 | -0/+14 |
| | | |||||
| * | verify gpg commit using tmp keyring and db query | Alexis Reigel | 2017-07-27 | 2 | -2/+19 |
| | | |||||
| * | add primary keyid attribute to gpg keys | Alexis Reigel | 2017-07-27 | 4 | -6/+28 |
| | | |||||
| * | don't sync to keychain file | Alexis Reigel | 2017-07-27 | 3 | -140/+8 |
| | | |||||
| * | remove gpg from keychain when user's email changes | Alexis Reigel | 2017-07-27 | 3 | -27/+89 |
| | | |||||
| * | notification email on add new gpg key | Alexis Reigel | 2017-07-27 | 4 | -0/+57 |
| | | |||||
| * | gpg email verification | Alexis Reigel | 2017-07-27 | 2 | -12/+53 |
| | | |||||
| * | move current keychain methods to namespace | Alexis Reigel | 2017-07-27 | 2 | -20/+22 |
| | | |||||
| * | email handling for gpg keys | Alexis Reigel | 2017-07-27 | 1 | -0/+26 |
| | | |||||
| * | test with a gpg key with multiple emails | Alexis Reigel | 2017-07-27 | 3 | -16/+21 |
| | | |||||
| * | use example gpg key instead of my own | Alexis Reigel | 2017-07-27 | 4 | -211/+92 |
| | | |||||
| * | feature spec for gpg signed commits | Alexis Reigel | 2017-07-27 | 1 | -0/+32 |
| | | |||||
| * | add second gpg key for specs | Alexis Reigel | 2017-07-27 | 5 | -223/+309 |
| | |