| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | must now set the devise default scope (since we now have an :email scope) | Brett Walker | 2017-09-24 | 6 | -8/+8 |
| | | | | | and rubocop fixes | ||||
| * | add primary email as a secondary email whenever the primary is changed | Brett Walker | 2017-09-23 | 3 | -14/+12 |
| | | |||||
| * | more explantion why an `after_update` was replaced with an `after_commit` | Brett Walker | 2017-09-23 | 1 | -2/+4 |
| | | |||||
| * | fix to make gpg_keys_spec start passing | Brett Walker | 2017-09-23 | 1 | -1/+1 |
| | | |||||
| * | added email.confirmed scope and fix email comparison | Brett Walker | 2017-09-23 | 4 | -4/+18 |
| | | |||||
| * | allow a verified secondary email to be use as the primary without | Brett Walker | 2017-09-23 | 5 | -7/+42 |
| | | | | | a reconfirmation | ||||
| * | when user verifies a secondary email, revalidate GPG signatures | Brett Walker | 2017-09-23 | 2 | -0/+24 |
| | | |||||
| * | fixes for rubocop | Brett Walker | 2017-09-23 | 5 | -15/+12 |
| | | |||||
| * | moved devise_for :emails to live under `profiles`, removing the need | Brett Walker | 2017-09-23 | 3 | -4/+3 |
| | | | | | for `emails` to be a top level route | ||||
| * | updated schema.rb with correct changes | Brett Walker | 2017-09-23 | 1 | -0/+4 |
| | | |||||
| * | Return schema.rb to pre-rebase state | Brett Walker | 2017-09-23 | 1 | -29/+25 |
| | | | | | This reverts commit 9f186db09d7f380cfbde4c0061be77c272518547. | ||||
| * | when a primary email is replaced and added to the secondary emails list, | Brett Walker | 2017-09-23 | 4 | -4/+50 |
| | | | | | make sure it stays confirmed | ||||
| * | fix calls to Emails::DestroyService | Brett Walker | 2017-09-23 | 2 | -3/+3 |
| | | |||||
| * | small cleanup changes based on feedback | Brett Walker | 2017-09-23 | 5 | -18/+15 |
| | | |||||
| * | optimized the email services | Brett Walker | 2017-09-23 | 6 | -16/+19 |
| | | |||||
| * | Make GPG signature verification work with non-primary email (#36959) | Brett Walker | 2017-09-23 | 5 | -22/+68 |
| | | |||||
| * | updated schema.rb | Brett Walker | 2017-09-23 | 1 | -25/+29 |
| | | |||||
| * | tweaks for rubocop | Brett Walker | 2017-09-23 | 7 | -15/+14 |
| | | |||||
| * | add verified/unverified labels to profile emails. | Brett Walker | 2017-09-23 | 7 | -10/+83 |
| | | | | | added "Resend confirmation email" for unverified emails | ||||
| * | refactored `_email_with_badge` partial from gpg into shared, so it can | Brett Walker | 2017-09-23 | 3 | -5/+5 |
| | | | | | be used with the email profile page as well | ||||
| * | refactored the Spinach feature `features/profile/emails.feature` into | Brett Walker | 2017-09-23 | 1 | -0/+56 |
| | | | | | an rspec feature | ||||
| * | use `add_concurrent_index` to add the :confirmation_token index | Brett Walker | 2017-09-23 | 2 | -1/+36 |
| | | |||||
| * | changed from `if !` to `unless` | Brett Walker | 2017-09-23 | 1 | -1/+1 |
| | | |||||
| * | move #cta properly under #content | Brett Walker | 2017-09-23 | 2 | -9/+9 |
| | | |||||
| * | refactored the account confirmation into a partial. Also made the | Brett Walker | 2017-09-23 | 6 | -31/+38 |
| | | | | | text in the `.text` version consistent with the `.html` version | ||||
| * | remove unnecessary devise_scope | Brett Walker | 2017-09-23 | 1 | -2/+0 |
| | | |||||
| * | Send a confirmation email when the user adds a secondary email address. ↵ | Brett Walker | 2017-09-23 | 19 | -89/+109 |
| | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385 | ||||
| * | Merge branch 'sh-fix-issue-38246' into 'master' | Yorick Peterse | 2017-09-23 | 3 | -2/+7 |
| |\ | | | | | | | | | | | | | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Closes #38246 See merge request gitlab-org/gitlab-ce!14460 | ||||
| | * | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246 | Stan Hu | 2017-09-22 | 3 | -2/+7 |
| |/ | | | | | | | | | | | `email_provider` by default is NULL, and if a user had not logged the value would remain NULL. Upgrading to GitLab 10.0 would lead to a PG::UniqueViolation because the post-deploy migration would attempt to reinsert the entry because the NULL comparison between `users.email_provider` and `user_synced_attributes_metadata.email_provider` would never match. Closes #38246 | ||||
| * | Merge branch '38171-workaround' into 'master' | Robert Speicher | 2017-09-22 | 1 | -1/+4 |
| |\ | | | | | | | | | | | | | Workaround for n+1 in Projects::TreeController#show Closes #38171 See merge request gitlab-org/gitlab-ce!14455 | ||||
| | * | Workaround for n+1 in Projects::TreeController#show38171-workaround | Andrew Newdigate | 2017-09-22 | 1 | -1/+4 |
| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261 | ||||
| * | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master' | Douwe Maan | 2017-09-22 | 10 | -22/+175 |
| |\ \ | | | | | | | | | | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417 | ||||
| | * | | Allow the git circuit breaker to correctly handle missing repository storages | Nick Thomas | 2017-09-22 | 10 | -22/+175 |
| | | | | |||||
| * | | | Merge branch 'docs-update-ux-guide' into 'master' | Marcia Ramos | 2017-09-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | fix typo in icons section See merge request gitlab-org/gitlab-ce!14444 | ||||
| | * | | | fix typo in icons sectiondocs-update-ux-guide | Sarrah Vesselov | 2017-09-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'post_receive_n_plus_1_workaround' into 'master' | Robert Speicher | 2017-09-22 | 1 | -2/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Workaround for #38259 See merge request gitlab-org/gitlab-ce!14453 | ||||
| | * | | | | Workaround for #38259 | Andrew Newdigate | 2017-09-22 | 1 | -2/+5 |
| |/ / / / | |||||
| * | | | | Merge branch 'dm-group-share-lock-default-help' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inform user that current shared projects will remain shared Closes #38220 See merge request gitlab-org/gitlab-ce!14441 | ||||
| | * | | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-help | Douwe Maan | 2017-09-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'remove-redundant-icons' into 'master' | Annabel Dunstone Gray | 2017-09-22 | 6 | -29/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old icons from project page Closes #36567 See merge request gitlab-org/gitlab-ce!14185 | ||||
| | * | | | | | Removed old icons from project page | Phil Hughes | 2017-09-22 | 6 | -29/+3 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'ee-to-ce-2017-09-22' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -7/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't show %board-add-issues-modal if there's no project See merge request gitlab-org/gitlab-ce!14442 | ||||
| | * | | | | | Don't show it if there's no project.ee-to-ce-2017-09-22 | Lin Jen-Shin | 2017-09-22 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is aligning with EE | ||||
| * | | | | | | Merge branch 'winh-i18-branches-page' into 'master' | Phil Hughes | 2017-09-22 | 4 | -66/+79 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make branches page translatable Closes #32797 See merge request gitlab-org/gitlab-ce!14221 | ||||
| | * | | | | | Make branches page translatable | Winnie Hellmann | 2017-09-22 | 4 | -66/+79 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'jej/demonstrate-details-summary' into 'master' | Achilleas Pipinellis | 2017-09-22 | 1 | -0/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.md See merge request gitlab-org/gitlab-ce!14247 | ||||
| | * | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summary | James Edwards-Jones | 2017-09-15 | 1 | -0/+24 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'feature/migrate-repository-diff' into 'master' | Douwe Maan | 2017-09-22 | 5 | -16/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitaly Closes gitaly#524 See merge request gitlab-org/gitlab-ce!14251 | ||||
| | * | | | | | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diff | Ahmad Sherif | 2017-09-21 | 5 | -16/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#524 | ||||
| * | | | | | | | Merge branch 'ee-add-project-repository-storages-index' into 'master' | Douwe Maan | 2017-09-22 | 3 | -1/+26 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Index projects on repository storage See merge request gitlab-org/gitlab-ce!14414 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |