summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update required Workhorse version to v3.2.0workhorse-updateAlejandro Rodríguez2017-10-051-1/+1
* 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
| * | | 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 '38801-add-or-update-identities-should-only-work-if-gl-user-exis...Douwe Maan2017-10-051-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Only add identities to a user if we find one in Gitlab::OAuth::User.38801-add-or-update-identities-should-only-work-if-gl-user-existsTiago Botelho2017-10-051-0/+2
* | | | Merge branch 'patch-26' into 'master'Achilleas Pipinellis2017-10-051-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Update github.md importer docs to clarify branches from forks get created in GLLee Matos2017-10-051-0/+5
|/ / /
* | | Merge branch '38031-monitoring-hover-info-is-clipped' into 'master'Tim Zallmann2017-10-054-1/+45
|\ \ \
| * \ \ Merge branch 'master' into 38031-monitoring-hover-info-is-clipped38031-monitoring-hover-info-is-clippedJose Ivan Vargas2017-10-03492-6601/+12434
| |\ \ \
| * | | | Fixed deployment flag having content hidden when being too far rightJose Ivan Vargas2017-09-274-1/+45
* | | | | Merge branch 'group-milestones-breadcrumb' into 'master'Tim Zallmann2017-10-052-1/+7
|\ \ \ \ \
| * | | | | Fixes group milestones breadcrumb linksgroup-milestones-breadcrumbPhil Hughes2017-10-042-1/+7
* | | | | | Merge branch 'rs-qa-default-password' into 'master'Grzegorz Bizon2017-10-052-8/+24
|\ \ \ \ \ \
| * | | | | | Use the default password from the GDK's root userRobert Speicher2017-10-052-8/+24
* | | | | | | Merge branch 'use-simple-tmp-ref-path' into 'master'Sean McGivern2017-10-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use simple path for tmp ref, avoiding extra dirLin Jen-Shin2017-10-051-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'declarative-policy-optimisations' into 'master'Robert Speicher2017-10-053-19/+37
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Speed up cached_pass? for composite rulesSean McGivern2017-10-051-8/+12
View Lorry Controller Status