summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove no longer required methodsRubén Dávila2017-10-051-10/+0
* Convert migration to a post deployment migrationRubén Dávila2017-10-051-0/+0
* Add CHANGELOG entryRubén Dávila2017-10-051-0/+5
* Add migration to generate GpgKeySubkeys records and update signaturesRubén Dávila2017-10-051-0/+59
* Fix some broken specsRubén Dávila2017-10-052-3/+3
* Address feedback from last code reviewRubén Dávila2017-10-056-16/+16
* Consider GPG subkeys when trying to update invalid GPG signaturesRubén Dávila2017-10-051-1/+2
* Remove unused associationRubén Dávila2017-10-051-1/+0
* Add more specs to cover subkeys scenariosRubén Dávila2017-10-054-0/+252
* Add some basic specs and refactor model and validationsRubén Dávila2017-10-0510-11/+114
* Add missing DOWNTIME declarationRubén Dávila2017-10-051-0/+2
* Render GPG subkeys on index pageRubén Dávila2017-10-054-1/+19
* Associate GgpSignature with GpgKeySubkey if comes from a subkeyRubén Dávila2017-10-056-13/+56
* Add ability to include subkeys when finding by fingerprintRubén Dávila2017-10-052-1/+12
* Refactor the extraction and generation of GPG subkeysRubén Dávila2017-10-052-21/+5
* Use a separate model to handle GPG subkeysRubén Dávila2017-10-055-12/+22
* Delegate #key to parent when working with a GPG subkeyRubén Dávila2017-10-051-0/+5
* Process and create subkeys when a new GPG key is createdRubén Dávila2017-10-054-2/+51
* Merge branch 'backport_from_EE' into 'master'Rémy Coutable2017-10-051-3/+1
|\
| * Minor backport from EEbackport_from_EEValery Sizov2017-10-051-3/+1
* | Merge branch 'digitalmoksha/gitlab-ce-feature/verify_secondary_emails' into '...Sean McGivern2017-10-0544-164/+568
|\ \
| * | Make sure spec expectations are in their own paragraphsdigitalmoksha/gitlab-ce-feature/verify_secondary_emailsDouwe Maan2017-10-051-0/+52
| * | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-05979-9560/+17611
| |\ \
| * | | spacing and small optimisationsAlexandra2017-10-0110-24/+28
| * | | fix whitespaceBrett Walker2017-09-242-3/+2
| * | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-246-8/+8
| * | | add primary email as a secondary email whenever the primary is changedBrett Walker2017-09-233-14/+12
| * | | more explantion why an `after_update` was replaced with an `after_commit`Brett Walker2017-09-231-2/+4
| * | | fix to make gpg_keys_spec start passingBrett Walker2017-09-231-1/+1
| * | | added email.confirmed scope and fix email comparisonBrett Walker2017-09-234-4/+18
| * | | allow a verified secondary email to be use as the primary withoutBrett Walker2017-09-235-7/+42
| * | | when user verifies a secondary email, revalidate GPG signaturesBrett Walker2017-09-232-0/+24
| * | | fixes for rubocopBrett Walker2017-09-235-15/+12
| * | | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-233-4/+3
| * | | updated schema.rb with correct changesBrett Walker2017-09-231-0/+4
| * | | Return schema.rb to pre-rebase stateBrett Walker2017-09-231-29/+25
| * | | when a primary email is replaced and added to the secondary emails list,Brett Walker2017-09-234-4/+50
| * | | fix calls to Emails::DestroyServiceBrett Walker2017-09-232-3/+3
| * | | small cleanup changes based on feedbackBrett Walker2017-09-235-18/+15
| * | | optimized the email servicesBrett Walker2017-09-236-16/+19
| * | | Make GPG signature verification work with non-primary email (#36959)Brett Walker2017-09-235-22/+68
| * | | updated schema.rbBrett Walker2017-09-231-25/+29
| * | | tweaks for rubocopBrett Walker2017-09-237-15/+14
| * | | add verified/unverified labels to profile emails.Brett Walker2017-09-237-10/+83
| * | | refactored `_email_with_badge` partial from gpg into shared, so it canBrett Walker2017-09-233-5/+5
| * | | refactored the Spinach feature `features/profile/emails.feature` intoBrett Walker2017-09-231-0/+56
| * | | use `add_concurrent_index` to add the :confirmation_token indexBrett Walker2017-09-232-1/+36
| * | | changed from `if !` to `unless`Brett Walker2017-09-231-1/+1
| * | | move #cta properly under #contentBrett Walker2017-09-232-9/+9
| * | | refactored the account confirmation into a partial. Also made theBrett Walker2017-09-236-31/+38
View Lorry Controller Status