summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-272-6/+18
|\ | | | | | | | | | | | | Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
| * Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-262-2/+10
| |
| * Add `rescue false`.blackst0ne2017-07-262-2/+2
| |
| * Refactor CSRF protectionblackst0ne2017-07-262-32/+6
| |
| * Add CSRF token verification to APIblackst0ne2017-07-261-4/+34
| |
* | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-271-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Add author_id & assignee_id param to /issues API Closes #29430 See merge request !13004
| * | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+5
| | |
| * | Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+5
| | | | | | | | | | | | Allow issues filtering on `author_id` and `assignee_id`.
* | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just ↵Casper2017-07-261-1/+1
| | | | | | | | | | | | hard-coded attributes.
* | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-12/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * | | Fix plain LDAP (no encryption)Michael Kozono2017-07-261-3/+6
| | | |
| * | | Fix code styleMichael Kozono2017-07-261-5/+5
| | | |
| * | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-5/+1
| | | | | | | | | | | | | | | | And closer to the configuration setup. The code doesn’t need to know about this.
| * | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-261-0/+2
| | | |
| * | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-261-0/+1
| | | |
| * | | Verify certificates in `omniauth-ldap`Michael Kozono2017-07-261-1/+2
| | | |
| * | | Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-261-0/+1
| | | |
| * | | Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-261-5/+15
| | | |
| * | | Set `Net::LDAP` encryption properlyMichael Kozono2017-07-261-8/+26
| | | |
| * | | Use encryption instead of methodMichael Kozono2017-07-261-2/+2
| | | | | | | | | | | | | | | | The method key is deprecated in the `gitlab_omniauth-ldap` gem.
* | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-261-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lower path index to redirect_routes Closes #34638 See merge request !13062
| * | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-251-0/+2
| | | | |
* | | | | Merge branch 'post-upload-pack-opt-out' into 'master'Sean McGivern2017-07-261-1/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Enable gitaly_post_upload_pack by default See merge request !13078
| * | | | Enable gitaly_post_upload_pack by defaultJacob Vosmaer2017-07-251-1/+4
| |/ / /
* | | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-263-5/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Implement GRPC call to RepositoryService See merge request !13019
| * | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-263-5/+23
| | | | |
* | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-6/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove project_key from the JIRA configuration Closes #31129 See merge request !12050
| * | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-6/+0
| | |_|/ | |/| |
* | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-254-22/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
View Lorry Controller Status