summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove an unused method17849-allow-admin-to-restrict-min-key-length-and-technoRémy Coutable2017-02-241-17/+0
* Disable keys that don't match the SSH key requirementsRémy Coutable2017-02-233-8/+58
* Use the minimum acceptable length as the defaultRémy Coutable2017-02-231-2/+2
* Improve ApplicationSetting specs a bitRémy Coutable2017-02-231-2/+2
* Generate SSH key fingerprint without shelling outRémy Coutable2017-02-232-25/+20
* Rename the ECDSA factory name to be more explicitRémy Coutable2017-02-233-12/+30
* Add a setting to enforce minimum DSA key length defaulting to 2048Rémy Coutable2017-02-2312-13/+41
* Increase default minimum RSA key length to 2048 bitsRémy Coutable2017-02-236-8/+8
* Provide a list of allowed values for each SSH key technologyRémy Coutable2017-02-235-11/+16
* Use Gitlab::SSHPublicKey.technology_namesRémy Coutable2017-02-223-3/+3
* Update net-ssh to 4.1.0Rémy Coutable2017-02-222-3/+3
* Add Gitlab::SSHPublicKey::TechnologiesRémy Coutable2017-02-222-1/+40
* Further fixes and improvementsRémy Coutable2017-02-2119-77/+158
* Add settings for minimum key strength and allowed key typeCorey Hinshaw2017-02-2117-25/+352
* Merge branch 'patch-1' into 'master'Rémy Coutable2017-02-211-1/+1
|\
| * Update GitLab CE/EE comparison & subscribe links in README.mdPeter Dave Hello2017-02-211-1/+1
* | Merge branch 'dropdown-loading-class-add' into 'master' Filipa Lacerda2017-02-212-1/+4
|\ \
| * | Fixed eslint errordropdown-loading-class-addPhil Hughes2017-02-201-1/+1
| * | Fixed ref switcher testsPhil Hughes2017-02-201-0/+2
| * | Changes when loading indicator is added to dropdownPhil Hughes2017-02-201-1/+2
* | | Merge branch '28357-colon-search' into 'master' Clement Ho2017-02-214-2/+32
|\ \ \ | |_|/ |/| |
| * | Allow searching issues for strings containing colonsSimon Knox2017-02-214-2/+32
| |/
* | Merge branch 'add-approving-license-process' into 'master' Clement Ho2017-02-211-0/+7
|\ \
| * | Add process for requesting approval for licensesadd-approving-license-processClement Ho2017-02-171-0/+7
* | | Merge branch 'fix-spinach-failure' into 'master' Robert Speicher2017-02-211-0/+1
|\ \ \
| * | | Fix Spinach failurefix-spinach-failureDouwe Maan2017-02-201-0/+1
* | | | Merge branch '26206-fix-download-dropdown' into 'master' Clement Ho2017-02-203-0/+16
|\ \ \ \
| * | | | Set dropdown to fixed height of `250px` and make it scrollable26206-fix-download-dropdownKushal Pandya2017-02-092-0/+12
| * | | | Fix dropdown height regressionKushal Pandya2017-02-091-2/+0
| * | | | Update MR numberKushal Pandya2017-02-091-1/+1
| * | | | Add changelog entryKushal Pandya2017-02-091-0/+4
| * | | | Set dropdown height fixed to `250px;` and make it scrollableKushal Pandya2017-02-091-0/+2
* | | | | Merge branch 'rename-karma-job' into 'master' Alfredo Sumaran2017-02-201-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename karma job to rake karmarename-karma-jobClement Ho2017-02-171-2/+2
* | | | | Merge branch '27934-left-align-nav' into 'master' Alfredo Sumaran2017-02-207-105/+84
|\ \ \ \ \
| * | | | | Update positioning of nav scroll arrows27934-left-align-navAnnabel Dunstone Gray2017-02-172-4/+8
| * | | | | Move tanuki to left of title; increase max-width of titleAnnabel Dunstone Gray2017-02-173-25/+6
| * | | | | Refactor project stats & last_commit CSS; left align main nav itemsAnnabel Dunstone Gray2017-02-174-76/+70
* | | | | | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-202-37/+44
|\ \ \ \ \ \
| * | | | | | Don't use potentially slow ForkService in specdm-fix-editing-files-on-forks-quickDouwe Maan2017-02-201-4/+6
| * | | | | | Fix issue where files on a fork could not be editedDouwe Maan2017-02-172-31/+36
* | | | | | | Merge branch 'ux-guide-add-personas' into 'master' Régis Freyd (GitLab)2017-02-204-11/+159
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] UX Guide: Add personasAllison Whilden2017-02-204-11/+159
* | | | | | | | Merge branch '26315-unify-labels-filter-behavior' into 'master' Rémy Coutable2017-02-205-19/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Unify issues search behavior by always filtering when ALL labels matches26315-unify-labels-filter-behaviorOswaldo Ferreira2017-02-205-19/+52
* | | | | | | | | Merge branch 'feature/github-find-users-by-email' into 'master' Robert Speicher2017-02-2012-50/+196
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reuse User#find_by_any_email on UserFormatter#find_by_emailDouglas Barbosa Alexandre2017-02-201-10/+2
| * | | | | | | | | Use leading periods on UserFormatter#find_by_external_uidDouglas Barbosa Alexandre2017-02-201-2/+3
| * | | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2017-02-201-0/+4
| * | | | | | | | | Add a simple cache for Gitlab::GithubImport::Client#userDouglas Barbosa Alexandre2017-02-201-0/+8