summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'Sean McGivern2017-07-284-14/+11
|\
| * Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-284-14/+11
* | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil TrzciƄski2017-07-283-0/+12
|\ \ | |/ |/|
| * Remove if pipeline.variables in Ci::Build#variablesShinya Maeda2017-07-281-1/+1
| * fix merge missShinya Maeda2017-07-281-1/+1
| * initShinya Maeda2017-07-283-1/+13
* | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-281-0/+9
|\ \ | |/ |/|
| * Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-281-0/+9
* | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-2/+6
|\ \
| * | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-2/+6
* | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-0/+2
|\ \ \
| * | | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-apiBob Van Landuyt2017-07-271-0/+2
* | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-5/+16
|\ \ \ \
| * | | | Encapsulate the commit.sha logicHiroyuki Sato2017-07-271-1/+5
| * | | | Refactor: use keyword arguments for optional parametersHiroyuki Sato2017-07-231-1/+1
| * | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23241-2841/+6059
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-5/+12
* | | | | Merge branch 'remove_blob_by_oid' into 'master'Robert Speicher2017-07-271-4/+0
|\ \ \ \ \
| * | | | | Removed `Repository#blob_by_oid` unused methodremove_blob_by_oidAndrew Newdigate2017-07-261-4/+0
| | |_|_|/ | |/| | |
* | | | | improve gpg key validationAlexis Reigel2017-07-271-2/+3
* | | | | validate the foreign_key instead of the relationAlexis Reigel2017-07-271-1/+1
* | | | | update all records at once using `update_all`Alexis Reigel2017-07-271-6/+5
* | | | | simplify nil handlingAlexis Reigel2017-07-271-2/+1
* | | | | upcase in the model instead of in the viewAlexis Reigel2017-07-272-0/+12
* | | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-1/+7
* | | | | use db's on_delete instead of has_many :dependentAlexis Reigel2017-07-272-2/+2
* | | | | use ShaAttribute for gpg table columnsAlexis Reigel2017-07-272-0/+10
* | | | | store gpg user name and email on the signatureAlexis Reigel2017-07-271-5/+11
* | | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-0/+11
* | | | | simplify fetching of commitAlexis Reigel2017-07-271-0/+4
* | | | | use after_commit instead of AfterCommitQueueAlexis Reigel2017-07-272-12/+5
* | | | | validate presence of user on gpg_keyAlexis Reigel2017-07-271-0/+2
* | | | | use hash instead of 2d arrayAlexis Reigel2017-07-271-1/+1
* | | | | allow removal of gpg key by nullifying signaturesAlexis Reigel2017-07-271-0/+1
* | | | | perform signature update in sidekiq workerAlexis Reigel2017-07-272-3/+8
* | | | | update invalid gpg signatures when email changesAlexis Reigel2017-07-272-4/+9
* | | | | update invalid gpg signatures when key is createdAlexis Reigel2017-07-271-0/+5
* | | | | store gpg_key_primary_keyid for unknown gpg keysAlexis Reigel2017-07-271-0/+1
* | | | | move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-5/+0
* | | | | gpg signature is only valid when key is verifiedAlexis Reigel2017-07-271-0/+4
* | | | | bail if the commit has no signatureAlexis Reigel2017-07-271-5/+1
* | | | | cache the gpg commit signatureAlexis Reigel2017-07-271-20/+5
* | | | | gpg signature model for gpg verification cachingAlexis Reigel2017-07-271-0/+7
* | | | | verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-271-1/+16
* | | | | add primary keyid attribute to gpg keysAlexis Reigel2017-07-271-1/+14
* | | | | don't sync to keychain fileAlexis Reigel2017-07-272-32/+1
* | | | | use more descriptive variable namesAlexis Reigel2017-07-271-5/+8
* | | | | remove gpg from keychain when user's email changesAlexis Reigel2017-07-272-12/+26
* | | | | notification email on add new gpg keyAlexis Reigel2017-07-271-0/+7
* | | | | gpg email verificationAlexis Reigel2017-07-271-0/+16