summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
* fix merge missShinya Maeda2017-07-281-0/+4
* initShinya Maeda2017-07-283-4/+15
* Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-7/+24
|\
| * Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-7/+24
* | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-0/+36
|\ \
| * | Encapsulate the commit.sha logicHiroyuki Sato2017-07-271-4/+26
| * | Refactor: use keyword arguments for optional parametersHiroyuki Sato2017-07-231-2/+2
| * | Change double quotes to single quotesHiroyuki Sato2017-07-231-7/+7
| * | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23159-3961/+10710
| |\ \
| * | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-0/+14
* | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-273-0/+205
|\ \ \ \
| * | | | improve gpg key validationAlexis Reigel2017-07-271-1/+9
| * | | | validate the foreign_key instead of the relationAlexis Reigel2017-07-271-1/+1
| * | | | simplify nil handlingAlexis Reigel2017-07-271-0/+4
| * | | | store gpg user name and email on the signatureAlexis Reigel2017-07-271-3/+23
| * | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-0/+27
| * | | | simplify fetching of commitAlexis Reigel2017-07-271-0/+13
| * | | | validate presence of user on gpg_keyAlexis Reigel2017-07-271-0/+1
| * | | | use hash instead of 2d arrayAlexis Reigel2017-07-271-4/+4
| * | | | remove the :gpg rspec tagAlexis Reigel2017-07-271-3/+3
| * | | | update invalid gpg signatures when email changesAlexis Reigel2017-07-271-0/+20
| * | | | store gpg_key_primary_keyid for unknown gpg keysAlexis Reigel2017-07-271-0/+1
| * | | | move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-82/+0
| * | | | gpg signature is only valid when key is verifiedAlexis Reigel2017-07-271-0/+16
| * | | | cache the gpg commit signatureAlexis Reigel2017-07-271-23/+65
| * | | | gpg signature model for gpg verification cachingAlexis Reigel2017-07-271-0/+14
| * | | | verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-271-2/+2
| * | | | add primary keyid attribute to gpg keysAlexis Reigel2017-07-271-0/+8
| * | | | don't sync to keychain fileAlexis Reigel2017-07-272-107/+8
| * | | | remove gpg from keychain when user's email changesAlexis Reigel2017-07-272-24/+76
| * | | | notification email on add new gpg keyAlexis Reigel2017-07-271-0/+14
| * | | | gpg email verificationAlexis Reigel2017-07-271-3/+42
| * | | | move current keychain methods to namespaceAlexis Reigel2017-07-271-3/+5
| * | | | test with a gpg key with multiple emailsAlexis Reigel2017-07-271-1/+1
| * | | | use example gpg key instead of my ownAlexis Reigel2017-07-271-4/+4
| * | | | add second gpg key for specsAlexis Reigel2017-07-272-7/+7
| * | | | add / remove gpg keys to / from system keychainAlexis Reigel2017-07-271-3/+21
| * | | | only validate gpg_key#fingerprint "internally"Alexis Reigel2017-07-271-2/+0
| * | | | add emails method to GgpKeyAlexis Reigel2017-07-271-0/+8
| * | | | add gpg key modelAlexis Reigel2017-07-271-0/+41
| * | | | commit signature with specAlexis Reigel2017-07-271-0/+40
* | | | | Use described_class when possibleRémy Coutable2017-07-2737-172/+172
* | | | | Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-27117-119/+119
* | | | | Remove superfluous type defs in specsKeifer Furzland2017-07-2742-49/+49
|/ / / /
* | | | 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-262-1/+35
* | | | Fix project wiki web_url specMichael Kozono2017-07-261-1/+1
| |_|/ |/| |
* | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-261-6/+10
|\ \ \
| * | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-261-6/+10
| | |/ | |/|
* | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-7/+3
|\ \ \