summaryrefslogtreecommitdiff
path: root/app/models/key.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-101-0/+5
|\
| * Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-041-0/+5
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-07-141-0/+1
|\ \ | |/
| * Add error message for SSH key linebreaksNikita Verkhovin2015-07-121-0/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-eeDouwe Maan2015-05-051-0/+1
|\ \ | |/
| * Re-annotate modelsStan Hu2015-05-031-0/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-151-16/+4
|\ \ | |/
| * Refactor key fingerprint generation.Douwe Maan2015-04-141-40/+4
| * The new fingerprint format wis incompatible with the previous regex.Sašo Stanovnik2015-03-241-4/+11
| * Use 2 spaces for indentation, not 4.Sašo Stanovnik2015-03-241-1/+1
| * Fixed generating SSH key fingerprints in OpenSSH 6.8.Sašo Stanovnik2015-03-241-1/+18
* | Merge remote-tracking branch 'ce/master' into merge_ceMarin Jankovski2015-02-161-0/+1
|\ \ | |/
| * Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-0/+1
* | Merge remote-tracking branch 'ce/master' into merge_ceMarin Jankovski2015-01-291-2/+2
|\ \ | |/
| * Fix various typosSteven Burgart2015-01-181-2/+2
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-211-1/+1
|\ \ | |/
| * Simplify SSH fingerprint regexp extractionCiro Santilli2014-12-281-1/+1
* | Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-preJacob Vosmaer2014-09-151-0/+10
|\ \ | |/
| * Add system hook for ssh key changesLukas Erlacher2014-09-031-0/+10
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ceDmitriy Zaporozhets2014-07-101-2/+0
|\ \ | |/
| * Key strong paramsDmitriy Zaporozhets2014-06-261-2/+0
* | Use a scope to add/remove LDAP keysJacob Vosmaer2014-07-091-0/+2
|/
* Re-annotate modelsDmitriy Zaporozhets2014-04-091-2/+2
* Remove KeysObserverDmitriy Zaporozhets2014-04-021-0/+24
* Adapt use of Gitlab::Popen to new styleJacob Vosmaer2014-02-251-1/+1
* ReannotateDmitriy Zaporozhets2013-08-211-8/+8
* Validate fingerprint uniquenessJacob Vosmaer2013-07-171-14/+5
* Use Tempfile.open for automatic cleanupJacob Vosmaer2013-07-171-6/+1
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-121-1/+1
|\
| * Allow ecdsa SSH keysAkiva Levy2013-07-101-1/+1
* | store and display public key fingerprintDmitriy Zaporozhets2013-06-241-9/+31
* | AnnotatedDmitriy Zaporozhets2013-06-191-3/+3
|/
* More strict validation for SSH Key contentDmitriy Zaporozhets2013-05-131-1/+1
* Feature: Deploy keys between projectsDmitriy Zaporozhets2013-05-061-4/+0
* Create DeployKey & DeployKeysProject models. Bulding many to many relation be...Dmitriy Zaporozhets2013-05-061-8/+3
* Update model methodsAndrey Kumanyaev2013-04-031-2/+2
* remove unused code related to gitoliteDmitriy Zaporozhets2013-02-261-9/+0
* Merge pull request #2996 from raphendyr/ssh_fingerprint_fixDmitriy Zaporozhets2013-02-181-1/+1
|\
| * Fix ssh key fingerprinting test to use exitcodeJaakko Kantojärvi2013-02-151-1/+1
* | remove commented codeDmitriy Zaporozhets2013-02-151-1/+1
|/
* dont allow duplicates in ssh keysDmitriy Zaporozhets2013-02-071-15/+3
* add remove keys from gitlab-shell by idDmitriy Zaporozhets2013-02-051-2/+2
* Make gitlab works with gitlab-shellDmitriy Zaporozhets2013-02-041-0/+4
* Fix few bugs and tests after refactoring ownership logicDmitriy Zaporozhets2013-01-021-1/+1
* Annotated. schema updatedDmitriy Zaporozhets2012-11-191-15/+14
* AnnotatedDmitriy Zaporozhets2012-10-091-0/+1
* simple refactoringAndrey Kumanyaev2012-10-091-6/+5
* Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitoliteValeriy Sizov2012-10-031-1/+16
|\
| * Reject ssh keys that break gitolite.Sytse Sijbrandij2012-09-241-1/+16
* | cosmetical cleanup of modelsNihad Abbasov2012-09-271-10/+6