0b0d04b4db
Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'
...
Improve deploy environment chatops slash command
Closes #34748
See merge request !13150
2017-07-31 15:28:07 +00:00
0d52e59de4
Merge branch '29385/add_shrug_command' into 'master'
...
Fixes #29385 : Add /shrug and /tableflip commands
Closes #29385
See merge request !10068
2017-07-31 14:02:00 +00:00
a628d39599
Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'
...
Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor
Closes #35752
See merge request !13185
2017-07-31 10:56:23 +00:00
ebd2ed8f64
Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor
2017-07-31 11:43:35 +02:00
15d00fc3d3
Merge branch 'gitaly-398-git-garbage-collect' into 'master'
...
Migrate GitGarbageCollectWorker to Gitaly
Closes gitaly#398
See merge request !12975
2017-07-31 07:57:23 +00:00
a07fe9d7f8
Fixes #29385 : Add /shrug and /tableflip commands
...
- Updated DSL to support substitution definitions
- Added substitution definition, inherits from command definition
- Added tabelflip and shrug substitutions to interpret service
- Added support for substitution definitions to the extractor for preview mode.
- Added substitution handling in the interpret service
Signed-off-by: Alex Ives <alex@ives.mn>
2017-07-28 14:37:44 -05:00
0bb58ff885
Merge branch 'dm-large-push-performance' into 'master'
...
Load and process at most 100 commits when pushing into default branch
Closes #35531
See merge request !13132
2017-07-28 17:03:17 +00:00
05f90b861f
Migrate GitGarbageCollectWorker to Gitaly
2017-07-28 17:49:22 +02:00
0e355e5c92
Load and process at most 100 commits when pushing into default branch
2017-07-28 17:23:13 +02:00
bd2b68d73e
Merge branch 'dm-api-csrf-token-verification' into 'master'
...
Add log messages to clarify log messages about API CSRF token verification failure
Closes #35705
See merge request !13158
2017-07-28 14:39:36 +00:00
d020eabf29
Add log messages to clarify log messages about API CSRF token verification failure
2017-07-28 15:39:39 +02:00
07bcabb305
Improve wording related to deploy chatops command
2017-07-28 12:16:07 +02:00
da3100254f
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
...
Backport some recent changes related to LDAP from EE
See merge request !13119
2017-07-28 09:13:50 +00:00
29a8827752
Improve deploy environment chatops slash command
...
We now match deployment actions better. If there is more than one
deployment action matched, we check if there is an action which name
equals to environment name, instead of raising an error about too many
actions defined.
2017-07-28 10:56:50 +02:00
8e3f2ecfa9
Incorporate RefsService.FindAllBranches Gitaly RPC
2017-07-27 15:40:54 -04:00
432bb22308
Remove unused Gitlab::Git operations
2017-07-27 15:39:31 -04:00
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
066f4d8b71
Merge branch 'remove_custom_devise_failure_app' into 'master'
...
Remove GitLab custom failure app for Devise
See merge request !13136
2017-07-27 16:22:52 +00:00
ac0cbe6970
Merge branch 'feature/gpg-signed-commits' into 'master'
...
GPG signed commits
Closes #20268
See merge request !9546
2017-07-27 15:29:39 +00:00
3d83181b81
Remove GitLab custom fealure app for devise
2017-07-27 18:14:09 +03:00
842bcfa777
Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into 'master'
...
Ensure test files are deleted after fs metrics gathering run
Closes #35457
See merge request !13080
2017-07-27 14:45:02 +00:00
9488b7780e
optimize query, only select relevant db columns
2017-07-27 15:46:04 +02:00
ef97cb54ae
Backport some recent changes related to LDAP from EE
2017-07-27 08:45:16 -05:00
cd01e82873
store gpg user name and email on the signature
2017-07-27 15:44:39 +02:00
9be1732296
add comment explaining use of shell commands and file operations in the same methods
2017-07-27 15:44:13 +02:00
deb474b413
extract common method
2017-07-27 15:43:37 +02:00
b66e3726dc
also update gpg_signatures when gpg_key is null
2017-07-27 15:43:37 +02:00
7f03282f0f
remove duplicate statement
2017-07-27 15:43:37 +02:00
a7d2ebe508
simplify fetching of commit
2017-07-27 15:43:37 +02:00
4f7ba8f286
fix memoization
2017-07-27 15:43:37 +02:00
ee7468e786
we need to update the gpg_key as well
2017-07-27 15:43:36 +02:00
a01eabc19f
update rugged
...
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
2017-07-27 15:43:36 +02:00
028ecb081b
need to wrap the raw commit in a commit model
2017-07-27 15:42:53 +02:00
d7f4264368
no need for passing parameter
...
we introduced memoizing, so it's safe to call the method multiple times.
2017-07-27 15:42:53 +02:00
24671cd601
update invalid gpg signatures when key is created
2017-07-27 15:42:53 +02:00
d48eb77a96
allow updating of gpg signature through gpg commit
2017-07-27 15:42:53 +02:00
502e31bec9
memoize verified_signature call
2017-07-27 15:42:53 +02:00
5d5fd4babe
store gpg_key_primary_keyid for unknown gpg keys
...
we need to store the keyid to be able to update the signature later in
case the missing key is added later.
2017-07-27 15:42:53 +02:00
34810acd6c
move signature cache read to Gpg::Commit
...
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.
2017-07-27 15:42:53 +02:00
7b616d39ef
gpg signature is only valid when key is verified
2017-07-27 15:42:53 +02:00
8c4b6a32fc
bail if the commit has no signature
2017-07-27 15:42:53 +02:00
69e511c4c2
cache the gpg commit signature
...
we store the result of the gpg commit verification in the db because the
gpg verification is an expensive operation.
2017-07-27 15:42:53 +02:00
2f956fae03
verify gpg commit using tmp keyring and db query
2017-07-27 15:42:53 +02:00
3c42d73098
add primary keyid attribute to gpg keys
2017-07-27 15:42:53 +02:00
7e13d96715
don't sync to keychain file
2017-07-27 15:42:53 +02:00
8bd94a7304
remove gpg from keychain when user's email changes
2017-07-27 15:42:04 +02:00
0668521b2b
move current keychain methods to namespace
2017-07-27 15:40:41 +02:00
0e3d3d60ba
email handling for gpg keys
2017-07-27 15:40:41 +02:00
87c0fd3455
add / remove gpg keys to / from system keychain
2017-07-27 15:40:41 +02:00
e34cef0cd2
extract gpg functionality to lib class
2017-07-27 15:40:41 +02:00
Kamil Trzciński
Rémy Coutable
Sean McGivern
Douwe Maan
Alex Ives
Robert Speicher
Kim "BKC" Carlbäcker
Grzegorz Bizon
Douwe Maan
Alejandro Rodríguez
Ahmad Sherif
Dmitriy Zaporozhets
Valery Sizov
Alexis Reigel
Rubén Dávila
Pawel Chojnacki