summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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-0523-96/+149
|\ \ | |/ |/|
| * Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-05376-6001/+3309
| |\
| * | spacing and small optimisationsAlexandra2017-10-018-21/+21
| * | fix whitespaceBrett Walker2017-09-242-3/+2
| * | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-242-2/+2
| * | add primary email as a secondary email whenever the primary is changedBrett Walker2017-09-231-7/+5
| * | more explantion why an `after_update` was replaced with an `after_commit`Brett Walker2017-09-231-2/+4
| * | added email.confirmed scope and fix email comparisonBrett Walker2017-09-232-3/+6
| * | allow a verified secondary email to be use as the primary withoutBrett Walker2017-09-231-4/+14
| * | when user verifies a secondary email, revalidate GPG signaturesBrett Walker2017-09-231-0/+7
| * | fixes for rubocopBrett Walker2017-09-232-3/+2
| * | when a primary email is replaced and added to the secondary emails list,Brett Walker2017-09-232-4/+7
| * | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-1/+1
| * | small cleanup changes based on feedbackBrett Walker2017-09-233-14/+11
| * | optimized the email servicesBrett Walker2017-09-234-10/+14
| * | Make GPG signature verification work with non-primary email (#36959)Brett Walker2017-09-231-4/+11
| * | tweaks for rubocopBrett Walker2017-09-231-1/+1
| * | add verified/unverified labels to profile emails.Brett Walker2017-09-233-4/+26
| * | refactored `_email_with_badge` partial from gpg into shared, so it canBrett Walker2017-09-233-5/+5
| * | 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
| * | Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-2312-50/+45
* | | Merge branch '38031-monitoring-hover-info-is-clipped' into 'master'Tim Zallmann2017-10-052-1/+14
|\ \ \
| * \ \ Merge branch 'master' into 38031-monitoring-hover-info-is-clipped38031-monitoring-hover-info-is-clippedJose Ivan Vargas2017-10-03164-4137/+1247
| |\ \ \
| * | | | Fixed deployment flag having content hidden when being too far rightJose Ivan Vargas2017-09-272-1/+14
* | | | | Merge branch 'group-milestones-breadcrumb' into 'master'Tim Zallmann2017-10-051-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixes group milestones breadcrumb linksgroup-milestones-breadcrumbPhil Hughes2017-10-041-1/+2
* | | | | Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' in...Tim Zallmann2017-10-051-1/+1
|\ \ \ \ \
| * | | | | ensure prometheus graph values are properly typecast as numbersMike Greiling2017-10-041-1/+1
* | | | | | Merge branch 'remove_repo_prefix_from_api' into 'master'Rémy Coutable2017-10-051-1/+1
|\ \ \ \ \ \
| * | | | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-051-1/+1
| |/ / / / /
* | | | | | Resolve "Hover and legend data should be linked"Jose Ivan Vargas Lopez2017-10-055-18/+58
* | | | | | Resolve "Monitoring graph empty states are gigantic on `screen-sm` viewport s...Mike Greiling2017-10-053-34/+22
* | | | | | Merge branch 'jramsay-fix-file-list-title-case' into 'master'Douwe Maan2017-10-052-3/+3
|\ \ \ \ \ \
| * | | | | | Fix inconsistent use of sentence casejramsay-fix-file-list-title-caseJames Ramsay2017-10-042-3/+3
* | | | | | | Merge branch 'sh-fix-username-logging' into 'master'Sean McGivern2017-10-052-3/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix username and ID not logging in production_json.log for Git activitysh-fix-username-loggingStan Hu2017-10-042-3/+13
* | | | | | | Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-051-8/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox2017-10-03414-3548/+3079
| |\ \ \ \ \ \
| * | | | | | | improve merge request widget status icon UXSimon Knox2017-09-201-8/+24
* | | | | | | | Cleanup Select2 dropdown stylesWinnie Hellmann2017-10-041-99/+46
| |_|_|/ / / / |/| | | | | |
* | | | | | | Makes `@mentions links` have a different styling for better separationDimitrie Hoekstra2017-10-043-6/+13
* | | | | | | Merge branch 'tag-link-size' into 'master'Rémy Coutable2017-10-042-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Adjusts tag link to avoid underlining spacesGuilherme Vieira2017-10-032-4/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-edit-project-service-cancel-button-position' into 'master'Rémy Coutable2017-10-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix edit project service cancel button positionMatt Coleman2017-09-291-1/+1
* | | | | | | | Merge branch 'fork-layout-cleanup' into 'master'Filipa Lacerda2017-10-044-107/+77
|\ \ \ \ \ \ \ \
View Lorry Controller Status