summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix admin test49948-return-secondary-emails-when-an-admin-calls-users-apiDeAndre Harris2019-02-251-1/+0
* Apply some suggestionsDeAndre Harris2019-02-191-9/+5
* Apply suggestion to changelogs/unreleased/49948-return-secondary-emails-when-...DeAndre Harris2019-02-181-1/+1
* Fix unauthenticated testDeAndre Harris2019-02-151-2/+2
* Removes trailing whitespaceDeAndre Harris2019-02-151-1/+1
* Adds test for unauthenticated requestDeAndre Harris2019-02-151-0/+7
* Fixes indentation in docsDeAndre Harris2019-02-151-1/+1
* Exposes `secondary_emails` in `users` API for adminsDeAndre Harris2019-02-155-4/+42
* Merge branch '49502-gpg-signature-api-endpoint' into 'master'Douwe Maan2019-02-156-0/+110
|\
| * Add API docs for commit's GPG signature endpoint49502-gpg-signature-api-endpointBalasankar "Balu" C2019-02-143-0/+49
| * Add specs for commit's GPG signature API endpointBalasankar "Balu" C2019-02-141-0/+38
| * Add API endpoint to get a commit's GPG signatureBalasankar "Balu" C2019-02-142-0/+23
* | Merge branch 'sh-fix-board-user-assigns' into 'master'Douglas Barbosa Alexandre2019-02-144-1/+79
|\ \
| * | Fix 403 errors when adding an assignee list in project boardsStan Hu2019-02-144-1/+79
* | | Merge branch 'qa-ml-check-server-in-before-hook' into 'master'Mark Lapierre2019-02-144-15/+12
|\ \ \
| * | | Move server responding check to scenario before hookMark Lapierre2019-02-144-15/+12
* | | | Merge branch 'ac-secpick-template' into 'master'Robert Speicher2019-02-141-2/+2
|\ \ \ \
| * | | | Select Security Release template with secpickAlessio Caiazza2019-02-141-2/+2
* | | | | Merge branch 'filter-note-parameters' into 'master'Stan Hu2019-02-143-1/+40
|\ \ \ \ \
| * | | | | Filter note parametersAndrew Newdigate2019-02-143-1/+40
* | | | | | Merge branch 'inline-web-worker-cors' into 'master'Filipa Lacerda2019-02-141-0/+1
|\ \ \ \ \ \
| * | | | | | Fixed web workers not working locally in rspecPhil Hughes2019-02-141-0/+1
* | | | | | | Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'Filipa Lacerda2019-02-144-4/+36
|\ \ \ \ \ \ \
| * | | | | | | Fixes alignment of changed icon in Web IDEPhil Hughes2019-02-134-4/+36
* | | | | | | | Merge branch 'fix-metrics-reload' into 'master'Stan Hu2019-02-1411-24/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Metrics references to Object pathSarah Yasonik2019-02-1411-24/+24
|/ / / / / / / /
* | | | | | | | Merge branch 'tz-stylelint' into 'master'Annabel Dunstone Gray2019-02-1418-131/+1024
|\ \ \ \ \ \ \ \
| * | | | | | | | Added Stylelint SetupTim Zallmann2019-02-1418-131/+1024
* | | | | | | | | Merge branch 'improve-error-tracking-docs' into 'master'Achilleas Pipinellis2019-02-142-0/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add line to doc listing reqd Sentry token scopesReuben Pereira2019-02-142-0/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'make-danger-ask-for-backend-review-for-.gitlab-ci.yml' into 'ma...Nick Thomas2019-02-142-7/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Make Danger as for backend review for .gitlab-ci.ymlRémy Coutable2019-02-142-7/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'do-not-retry-jobs-in-quarantine' into 'master'Lin Jen-Shin2019-02-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not retry jobs in quarantine since they are supposed to failRémy Coutable2019-02-141-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch '44740-api-to-verify-a-given-user-has-right-to-merge-a-given-mer...Nick Thomas2019-02-144-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | API: Expose if the user can merge a given merge requestRobert Schilling2019-02-144-0/+24
|/ / / / / / / /
* | | | | | | | Merge branch 'simplify-secpick-git-commands' into 'master'Nick Thomas2019-02-141-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify bin/secpick git commandsPavel Shutsin2019-02-141-3/+1
* | | | | | | | | Merge branch 'reduce-diff-with-ee-in-app-services' into 'master'Lin Jen-Shin2019-02-1413-35/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reduce remaining diff with EE in app/servicesRémy Coutable2019-02-1413-35/+62
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'syntax-highlighting-again' into 'master'Phil Hughes2019-02-144-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add fix for suggested changes syntax highlightingAnnabel Dunstone Gray2019-02-144-5/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dz-grou-labels-specs' into 'master'Douglas Barbosa Alexandre2019-02-142-1/+36
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add more feature specs for group labelsDmitriy Zaporozhets2019-02-142-1/+36
| |/ / / / / / /
* | | | | | | | Merge branch 'if-24642-activity_service_optimization' into 'master'Lin Jen-Shin2019-02-143-2/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Optimize Redis usage in User::ActivityServiceif-24642-activity_service_optimizationImre Farkas2019-02-143-2/+22
* | | | | | | | Merge branch '56694-mark-group-level-labels-in-label-api-as-such' into 'master'Rémy Coutable2019-02-144-9/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Add docs and specsRobert Schilling2019-02-132-9/+20
| * | | | | | | | API: Indicate if label is a project labelRobert Schilling2019-02-132-0/+8
* | | | | | | | | Merge branch '9721-cannot-scroll-forwards-in-time-for-roadmap-view-ce' into '...Phil Hughes2019-02-142-1/+2
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status