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
8236b12dff
gpg signature model for gpg verification caching
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
d1101ec02e
use more descriptive variable names
2017-07-27 15:42:04 +02:00
8bd94a7304
remove gpg from keychain when user's email changes
2017-07-27 15:42:04 +02:00
c1281982bd
notification email on add new gpg key
2017-07-27 15:40:41 +02:00
f0fe1b9d43
gpg email verification
2017-07-27 15:40:41 +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
41c96c45f2
test with a gpg key with multiple emails
2017-07-27 15:40:41 +02:00
5ce61120b1
use example gpg key instead of my own
2017-07-27 15:40:41 +02:00
597ae6e220
feature spec for gpg signed commits
2017-07-27 15:40:41 +02:00
eb77e1068c
add second gpg key for specs
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
7b4d29f4b5
add profile gpg key page to manage gpg keys
2017-07-27 15:40:41 +02:00
ab4120de31
only validate gpg_key#fingerprint "internally"
2017-07-27 15:40:40 +02:00
7b7cd6f69d
add emails method to GgpKey
2017-07-27 15:40:40 +02:00
fbf1fd1a20
add gpg key model
2017-07-27 15:40:40 +02:00
28bb5e3d53
commit signature with spec
2017-07-27 15:40:40 +02:00
817d9558fe
Prototype key verification
2017-07-27 15:40:40 +02:00
4eebd8e195
Merge branch 'docs-fix-docs_styleguide' into 'master'
...
Remove mentions of SeanPackham since he's no longer with GitLab
See merge request !13081
2017-07-27 12:27:09 +00:00
fa3e4ddff0
Remove mentions of SeanPackham since he's no longer with GitLab
2017-07-27 12:27:09 +00:00
77d0007704
Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'
...
Ensure the overriding of Gitlab::Application.routes.default_url_options is only local
See merge request !13125
2017-07-27 12:10:24 +00:00
4d05e85375
Merge branch 'HA-external-urls-docs' into 'master'
...
Add note on external url setting for HA clusters.
See merge request !13089
2017-07-27 11:03:29 +00:00
72e88b0fa7
Merge branch 'winh-issuable-sidebar-height' into 'master'
...
Make issuable searchbar full height
Closes #35417
See merge request !13046
2017-07-27 10:50:38 +00:00
ef50875d3a
Merge branch '33601-add-csrf-token-verification-to-api' into 'master'
...
Resolve "Add CSRF token verification to API"
Closes #33601
See merge request !12154
2017-07-27 10:20:52 +00:00
2850efcdd5
Merge branch '35191-prioritized-labels-for-non-member' into 'master'
...
Remove help message about prioritized labels for non-members
Closes #35191
See merge request !12912
2017-07-27 10:06:26 +00:00
5e56890e31
Merge branch 'tc-issue-api-assignee' into 'master'
...
Add author_id & assignee_id param to /issues API
Closes #29430
See merge request !13004
2017-07-27 09:59:38 +00:00
2e483ca9e3
Merge branch 'rc/fix-tests-factories' into 'master'
...
Fix the :project factory by not copying the test repo twice
See merge request !13123
2017-07-27 08:55:53 +00:00
cbfdc7e3b5
Ensure the overriding of Gitlab::Application.routes.default_url_options is only local
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 10:46:59 +02:00
704ce761f3
Merge branch '35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters' into 'master'
...
Resolve "Can't create a merge request containing a binary file with non-UTF-8 characters"
Closes #35539
See merge request !13086
2017-07-27 08:39:51 +00:00
bfe8b96874
Add specs
2017-07-27 10:32:44 +02:00
477ba56f2d
Merge branch 'inline-js-removal-merge-requests' into 'master'
...
Inline JS Removal for Merge Requests
See merge request !13053
2017-07-27 08:30:16 +00:00
c580238581
Inline JS Removal for Merge Requests
2017-07-27 08:30:14 +00:00
6e2ebfa29d
Merge branch 'fix-participant-name-trailing' into 'master'
...
Fix participant name link trailing space on milestone page
Closes #35419
See merge request !13117
2017-07-27 08:26:28 +00:00
05e152fa7f
Fix the :project factory by not copying the test repo twice
...
Also, fixing some calls to the :project factory with the :test_repo
trait since this trait is already included in the :project factory.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 09:58:06 +02:00
69129f11df
Remove help message about prioritized labels for non-members
2017-07-27 15:27:16 +09:00
830257c920
Fix participant name link trailing space on milestone page
2017-07-26 16:43:41 -05:00
eb9ca0e7e1
Merge branch 'patch-19' into 'master'
...
change Fogbugz button to FogBugz
See merge request !13113
2017-07-26 21:28:32 +00:00
4c1773a768
Merge branch 'rs-update-large-table-list' into 'master'
...
Update the large table list in AddColumnWithDefaultToLargeTable cop
See merge request !13112
2017-07-26 18:59:50 +00:00
db2ea59f52
change Fogbugz button to FogBugz
2017-07-26 18:56:43 +00:00
ecd038cf8e
Merge branch 'added-nvmrc' into 'master'
...
added .nvmrc
See merge request !9183
2017-07-26 18:13:26 +00:00
a64e3d0847
Merge branch 'patch-24' into 'master'
...
Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes.
See merge request !13054
2017-07-26 16:48:14 +00:00
a5d2ce8e61
Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes.
2017-07-26 16:48:13 +00:00
02139f5a77
Update the large table list in AddColumnWithDefaultToLargeTable cop
...
- ci_builds -- 33 million rows, 55 GB
- merge_request_diff_files -- 5 million rows, 9 GB (and growing rapidly)
- merge_request_diffs -- 5 million rows, 190 GB
2017-07-26 12:40:59 -04:00
396b8f91ec
Fix saving diffs that are not valid UTF-8
...
Previously, we used Psych, which would:
1. Check if a string was encoded as binary, and not ASCII-compatible.
2. Add the !binary tag in that case.
3. Convert to base64.
We need to do the same thing, using a new column in place of the tag.
2017-07-26 15:34:57 +01:00
0c563225b6
Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'
...
Handle maximum pages artifacts size correctly
Closes #35317
See merge request !13072
2017-07-26 14:00:42 +00:00
Alexis Reigel
Kevin O'Connor
Rémy Coutable
Sean McGivern
Tim Zallmann
Douwe Maan
Phil Hughes
Takuya Noguchi
Clement Ho
Grzegorz Bizon
Ben Bodenmiller
Mike Greiling
Casper
Robert Speicher
Sean McGivern
Kamil Trzciński