summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add documentation about reading query plansdocs/document-query-plansYorick Peterse2018-08-172-1/+683
| | | | | | This adds a database guide on how to read the output of "EXPLAIN" and "EXPLAIN ANALYZE", and how to use this output to understand a query's performance and optimise it.
* Merge branch '50257-fix-auto-devops-glibc-pubkey-url' into 'master'Grzegorz Bizon2018-08-143-2/+7
|\ | | | | | | | | | | | | Resolve "Auto Devops failing to fetch Alpine glibc pubkey" Closes gitlab-org/quality/nightly#3 and #50257 See merge request gitlab-org/gitlab-ce!21182
| * Auto-DevOps.gitlab-ci.yml: Update glibc package signing key URLDylan Griffith2018-08-142-1/+6
| | | | | | | | | | | | Vendored in from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/185 Thanks @sgerrand
| * Fix flaky auto devops QA test by waiting longer for productionDylan Griffith2018-08-141-1/+1
| | | | | | | | This fixes https://gitlab.com/gitlab-org/quality/nightly/issues/3 because the code_quality job holds up the production job. Waiting longer should reduce the likelihood of this.
* | Merge branch 'ee-5863-customize-notifications-for-new-epic' into 'master'Grzegorz Bizon2018-08-1412-31/+87
|\ \ | | | | | | | | | | | | Backport of EE changes "Customize notifications for new epic - Web and API" See merge request gitlab-org/gitlab-ce!20793
| * | Move N_ calls into separate filesMark Chao2018-08-144-10/+19
| | | | | | | | | | | | | | | | | | These are dynamic translations, so has to be marked explicitly using `N_`, but they are not used in runtime, so can exist in separate file. https://github.com/grosser/gettext_i18n_rails#unfound-translations-with-rake-gettextfind
| * | Allow extensible mention type action for EEMark Chao2018-08-141-1/+7
| | |
| * | Allow NotificationRecipientService::Builder::Default to handle target ↵Mark Chao2018-08-141-1/+1
| | | | | | | | | | | | without project (e.g. Epic)
| * | Allow global event list containing all eventsMark Chao2018-08-141-2/+4
| | | | | | | | | | | | | | | This way we can globally set group only ee events too. Use nil to indicate global.
| * | Add email_events to replace EMAIL_EVENTS because it needs to be dynamic,Mark Chao2018-08-1410-18/+57
| | | | | | | | | allowing override for EE.
* | | Merge branch '50101-job-log-component' into 'master'Phil Hughes2018-08-143-0/+83
|\ \ \ | | | | | | | | | | | | | | | | Creates a vue component for the job log trace output See merge request gitlab-org/gitlab-ce!21167
| * | | Creates Vue component for job log traceFilipa Lacerda2018-08-133-0/+83
| | | |
* | | | Merge branch 'rz-update_events_documentation' into 'master'49019-extract-base-docker-image-for-test49019-extract-base-docker-image-for-code_quality49019-extract-base-docker-image-for-build49019-create-project-for-dockerfiles-for-auto-devopsAchilleas Pipinellis2018-08-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update GET project URL to be similar to GET user URL See merge request gitlab-org/gitlab-ce!21130
| * | | | Update GET project URL to be similar to GET user URLRonald van Zon2018-08-101-1/+1
| | | | |
* | | | | Merge branch '48942-rename-backlog-list-to-open-issue-boards' into 'master'Phil Hughes2018-08-148-8/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change `Backlog` list title to `Open` in Issue Boards Closes #48942 See merge request gitlab-org/gitlab-ce!21131
| * | | | | Update docs to change `Backlog` issue board list to `Open`Kushal Pandya2018-08-144-6/+6
| | | | | |
| * | | | | Add changelog entryKushal Pandya2018-08-141-0/+5
| | | | | |
| * | | | | Change `Backlog` list title to `Open`Kushal Pandya2018-08-143-2/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-remove-feature-gate-list-commits' into 'master'Douwe Maan2018-08-142-37/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature gate for ListNewCommits Closes gitaly#1286 and gitaly#1233 See merge request gitlab-org/gitlab-ce!21184
| * | | | | Remove feature gate for ListNewCommitsZeger-Jan van de Weg2018-08-142-37/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20087, this has been tested on .com now, and is stable. Closes https://gitlab.com/gitlab-org/gitaly/issues/1286 Closes https://gitlab.com/gitlab-org/gitaly/issues/1233
* | | | | | Merge branch 'gitaly-install-path' into 'master'Douwe Maan2018-08-146-82/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove storage path dependency of gitaly install task See merge request gitlab-org/gitlab-ce!21101
| * | | | | | Remove storage path dependency of gitaly install taskAlejandro Rodríguez2018-08-126-82/+45
| | | | | | |
* | | | | | | Merge branch 'upgrade-middleman-ci-template' into 'master'Douwe Maan2018-08-141-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Middleman template for GitLab CI See merge request gitlab-org/gitlab-ce!21174
| * | | | | | | Upgrade Middleman template for GitLab CIGabriel Mazetto2018-08-141-6/+7
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '48967-disable-statement-timeout' into 'master'Douwe Maan2018-08-1426-275/+400
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `disable_statement_timeout` will no longer leak to other migrations Closes #48967 See merge request gitlab-org/gitlab-ce!20503
| * | | | | | disable_statement_timeout doesn't require any argument anymoreGabriel Mazetto2018-08-1125-114/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it will decide the method for disable statement_timeout upon per transaction or per session, based on how it's called. When calling with a block, block will be executed and it will use session based statement_timeout, otherwise will default to existing behavior.
| * | | | | | Fix migration_helpers_specGabriel Mazetto2018-08-101-1/+2
| | | | | | |
| * | | | | | ChangelogGabriel Mazetto2018-08-101-0/+5
| | | | | | |
| * | | | | | Fix specs to use `disable_statement_timeout` correctlyGabriel Mazetto2018-08-1022-226/+234
| | | | | | |
| * | | | | | MigrationHelper `disable_statement_timeout` accepts `transaction: false`Gabriel Mazetto2018-08-102-44/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default statement_timeout will only be enabled during transaction lifetime, therefore not leaking outside of it. With `transaction: false` it will set for entire session, but requires a block to passed. It yields control and cleans up session after block finishes, also preventing leaking outside of it.
* | | | | | | Merge branch '50101-erased-block' into 'master'Phil Hughes2018-08-144-0/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a Vue component for the erased block on the job view page See merge request gitlab-org/gitlab-ce!21158
| * | | | | | | Optimize timeago tooltip logicFilipa Lacerda2018-08-131-12/+5
| | | | | | | |
| * | | | | | | Creates vue component for erased block on job viewFilipa Lacerda2018-08-134-0/+122
| | | | | | | |
* | | | | | | | Merge branch '50047-spam-logs-pagination' into 'master'Phil Hughes2018-08-142-1/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pagination formatting on /admin/spam_logs endpoint is broken" Closes #50047 See merge request gitlab-org/gitlab-ce!21145
| * | | | | | | Fix spam logs paginationAnnabel Dunstone Gray2018-08-102-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'frozen-string-enable-app-vestigial' into 'master'Stan Hu2018-08-1320-0/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in vestigial app files See merge request gitlab-org/gitlab-ce!21148
| * | | | | | | | Enable frozen string in vestigial app filesgfyoung2018-08-1220-0/+43
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | | | Merge branch 'sh-bump-rugged-0.27.4' into 'master'Robert Speicher2018-08-132-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rugged to 0.27.4 for security fixes See merge request gitlab-org/gitlab-ce!21170
| * | | | | | | | Bump rugged to 0.27.4 for security fixesStan Hu2018-08-132-1/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | See https://github.com/libgit2/libgit2/releases for more details.
* | | | | | | | Merge branch 'add_google_noto_color_emoji_font' into 'master'Clement Ho2018-08-135-3/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add Noto Color Emoji font support See merge request gitlab-org/gitlab-ce!19036
| * | | | | | | Add Noto Color Emoji font supportAlexander Popov2018-08-135-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a font from [Google](https://www.google.com/get/noto/). Arch Linux [has a recommendation of it](https://wiki.archlinux.org/index.php/fonts#Emoji_and_symbols). Add info about this into `docs/user/markdown.md#emoji`
* | | | | | | | Merge branch 'ide-live-preview-docs' into 'master'Filipa Lacerda2018-08-133-0/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added docs for Web IDE Client Evaluation Closes #50143 See merge request gitlab-org/gitlab-ce!21155
| * | | | | | | | Update docs and compress imagesJames Ramsay2018-08-133-13/+15
| | | | | | | | |
| * | | | | | | | Added docs for Web IDE Client EvaluationPhil Hughes2018-08-133-0/+32
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #50143
* | | | | | | | Merge branch 'visual-improvements-language-bar' into 'master'Phil Hughes2018-08-132-2/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve visuals of language bar on projects See merge request gitlab-org/gitlab-ce!21006
| * | | | | | | | Improve visuals of language bar on projectsDimitrie Hoekstra2018-08-132-2/+18
|/ / / / / / / /
* | | | | | | | Merge branch '41996-copy-to-clipboard-tooltip-appears-under-modal' into 'master'Clement Ho2018-08-133-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`Copy to Clipboard` tooltip appears under modal" Closes #41996 See merge request gitlab-org/gitlab-ce!21017
| * | | | | | | | Resolve "`Copy to Clipboard` tooltip appears under modal"Adriel Santiago2018-08-133-2/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'ide-small-scroll-area' into 'master'Filipa Lacerda2018-08-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed small scroll area in Web IDE Closes #50242 See merge request gitlab-org/gitlab-ce!21160
| * | | | | | | | Fixed small scroll area in Web IDEPhil Hughes2018-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #50242