summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* move signature cache read to Gpg::CommitAlexis Reigel2017-07-274-99/+52
* gpg signature is only valid when key is verifiedAlexis Reigel2017-07-274-3/+47
* bail if the commit has no signatureAlexis Reigel2017-07-273-7/+11
* cache the gpg commit signatureAlexis Reigel2017-07-275-46/+177
* gpg signature model for gpg verification cachingAlexis Reigel2017-07-274-0/+67
* verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-274-3/+43
* add primary keyid attribute to gpg keysAlexis Reigel2017-07-278-7/+73
* don't sync to keychain fileAlexis Reigel2017-07-276-190/+9
* use more descriptive variable namesAlexis Reigel2017-07-271-5/+8
* remove gpg from keychain when user's email changesAlexis Reigel2017-07-276-40/+118
* notification email on add new gpg keyAlexis Reigel2017-07-279-0/+101
* gpg email verificationAlexis Reigel2017-07-275-13/+81
* move current keychain methods to namespaceAlexis Reigel2017-07-274-30/+32
* email handling for gpg keysAlexis Reigel2017-07-273-2/+47
* test with a gpg key with multiple emailsAlexis Reigel2017-07-273-16/+21
* use example gpg key instead of my ownAlexis Reigel2017-07-274-211/+92
* feature spec for gpg signed commitsAlexis Reigel2017-07-271-0/+32
* add second gpg key for specsAlexis Reigel2017-07-275-223/+309
* add / remove gpg keys to / from system keychainAlexis Reigel2017-07-275-5/+59
* extract gpg functionality to lib classAlexis Reigel2017-07-274-12/+54
* add profile gpg key page to manage gpg keysAlexis Reigel2017-07-279-0/+131
* only validate gpg_key#fingerprint "internally"Alexis Reigel2017-07-272-7/+9
* add emails method to GgpKeyAlexis Reigel2017-07-273-0/+20
* add gpg key modelAlexis Reigel2017-07-274-0/+100
* commit signature with specAlexis Reigel2017-07-275-2/+281
* Prototype key verificationKevin O'Connor2017-07-277-0/+28
* Merge branch 'docs-fix-docs_styleguide' into 'master'Rémy Coutable2017-07-272-3/+3
|\
| * Remove mentions of SeanPackham since he's no longer with GitLabRémy Coutable2017-07-272-3/+3
|/
* Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'Sean McGivern2017-07-271-0/+4
|\
| * Ensure the overriding of Gitlab::Application.routes.default_url_options is on...rc/35599-stop-the-bleeding-of-default_url_optionsRémy Coutable2017-07-271-0/+4
* | Merge branch 'HA-external-urls-docs' into 'master'Sean McGivern2017-07-271-0/+6
|\ \
| * | Add note on external url setting for HA clusters.HA-external-urls-docsChenjerai Katanda2017-07-251-0/+6
* | | Merge branch 'winh-issuable-sidebar-height' into 'master'Tim Zallmann2017-07-271-0/+4
|\ \ \
| * | | Make issuable searchbar full heightwinh-issuable-sidebar-heightwinh2017-07-251-0/+4
* | | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-278-14/+168
|\ \ \ \
| * | | | Add specsDouwe Maan2017-07-274-7/+145
| * | | | Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-262-2/+10
| * | | | Remove spec/lib/api/helpers/csrf_tokens_spec.rbblackst0ne2017-07-261-42/+0
| * | | | Add `rescue false`.blackst0ne2017-07-263-3/+3
| * | | | Refactor CSRF protectionblackst0ne2017-07-264-34/+8
| * | | | Add CSRF token verification to APIblackst0ne2017-07-263-4/+80
* | | | | Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable2017-07-273-5/+20
|\ \ \ \ \
| * | | | | Remove help message about prioritized labels for non-membersTakuya Noguchi2017-07-273-5/+20
* | | | | | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-275-3/+63
|\ \ \ \ \ \
| * | | | | | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-243-14/+26
| * | | | | | Add author_id & assignee_id param to /issues APIToon Claes2017-07-245-1/+49
* | | | | | | Merge branch 'rc/fix-tests-factories' into 'master'Sean McGivern2017-07-276-9/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix the :project factory by not copying the test repo twicerc/fix-tests-factoriesRémy Coutable2017-07-276-9/+5
* | | | | | | Merge branch '35539-can-t-create-a-merge-request-containing-a-binary-file-wit...Rémy Coutable2017-07-2710-9/+79
|\ \ \ \ \ \ \
| * | | | | | | Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-charactersSean McGivern2017-07-2610-9/+79
View Lorry Controller Status