summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* remove unnecessary devise_scopeBrett Walker2017-09-231-2/+0
* Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-2319-89/+109
* Merge branch 'sh-fix-issue-38246' into 'master'Yorick Peterse2017-09-233-2/+7
|\
| * Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246Stan Hu2017-09-223-2/+7
|/
* Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-1/+4
|\
| * Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
* | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'Douwe Maan2017-09-2210-22/+175
|\ \
| * | Allow the git circuit breaker to correctly handle missing repository storagesNick Thomas2017-09-2210-22/+175
* | | Merge branch 'docs-update-ux-guide' into 'master'Marcia Ramos2017-09-221-1/+1
|\ \ \
| * | | fix typo in icons sectiondocs-update-ux-guideSarrah Vesselov2017-09-221-1/+1
* | | | Merge branch 'post_receive_n_plus_1_workaround' into 'master'Robert Speicher2017-09-221-2/+5
|\ \ \ \
| * | | | Workaround for #38259Andrew Newdigate2017-09-221-2/+5
|/ / / /
* | | | Merge branch 'dm-group-share-lock-default-help' into 'master'Rémy Coutable2017-09-221-1/+1
|\ \ \ \
| * | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-helpDouwe Maan2017-09-221-1/+1
* | | | | Merge branch 'remove-redundant-icons' into 'master'Annabel Dunstone Gray2017-09-226-29/+3
|\ \ \ \ \
| * | | | | Removed old icons from project pagePhil Hughes2017-09-226-29/+3
|/ / / / /
* | | | | Merge branch 'ee-to-ce-2017-09-22' into 'master'Rémy Coutable2017-09-221-7/+8
|\ \ \ \ \
| * | | | | Don't show it if there's no project.ee-to-ce-2017-09-22Lin Jen-Shin2017-09-221-7/+8
* | | | | | Merge branch 'winh-i18-branches-page' into 'master'Phil Hughes2017-09-224-66/+79
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Make branches page translatableWinnie Hellmann2017-09-224-66/+79
|/ / / / /
* | | | | Merge branch 'jej/demonstrate-details-summary' into 'master'Achilleas Pipinellis2017-09-221-0/+24
|\ \ \ \ \
| * | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summaryJames Edwards-Jones2017-09-151-0/+24
* | | | | | Merge branch 'feature/migrate-repository-diff' into 'master'Douwe Maan2017-09-225-16/+61
|\ \ \ \ \ \
View Lorry Controller Status