summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-312-21/+23
|\
| * Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matchingGrzegorz Bizon2017-07-281-1/+1
| * Improve deploy environment chatops slash commandGrzegorz Bizon2017-07-282-21/+23
* | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-313-5/+70
|\ \
| * | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-283-5/+70
* | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-311-1/+1
|\ \ \
| * | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verificationDouwe Maan2017-07-311-1/+1
| |/ /
* | | Merge branch 'gitaly-398-git-garbage-collect' into 'master'Sean McGivern2017-07-311-1/+17
|\ \ \ | |/ / |/| |
| * | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-281-1/+17
* | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-281-2/+2
|\ \ \
| * | | Load and process at most 100 commits when pushing into default branchDouwe Maan2017-07-281-2/+2
* | | | Merge branch 'dm-api-csrf-token-verification' into 'master'Sean McGivern2017-07-281-0/+8
|\ \ \ \
| * | | | Add log messages to clarify log messages about API CSRF token verification fa...dm-api-csrf-token-verificationDouwe Maan2017-07-281-0/+8
| |/ / /
* | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-0/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-0/+6
| |/ /
* | | Incorporate RefsService.FindAllBranches Gitaly RPCgitaly-all-branchesAlejandro Rodríguez2017-07-273-5/+22
* | | Remove unused Gitlab::Git operationsAlejandro Rodríguez2017-07-271-162/+0
* | | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-272-13/+52
* | | Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher2017-07-271-23/+0
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
| * | | | 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
| * | | | 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
| * | | | move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-0/+3
| * | | | 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
| * | | | 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
| | |/ / | |/| |