summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run before_fork only once on bootpuma-init-restartJan Provaznik2019-07-016-26/+30
* Run do_master_restart callback on server startJan Provaznik2019-07-014-0/+30
* Merge branch 'grantyoung-52703-project-archive-compare-qa' into 'master'Mark Lapierre2019-07-018-23/+151
|\
| * First pass at new automated QA API test for #52703Grant Young2019-07-018-23/+151
|/
* Merge branch 'docs-fix-vue-wrapper-link' into 'master'Evan Read2019-07-011-1/+1
|\
| * Docs: minor fix to link formatczmj2019-07-011-1/+1
|/
* Merge branch 'add-notes-style' into 'master'Evan Read2019-07-011-1/+18
|\
| * Update styleguide.md to add Notes usage guidelinesMike Lewis2019-07-011-1/+18
|/
* Merge branch 'add-clusters-to-deployment' into 'master'Lin Jen-Shin2019-07-0111-25/+138
|\
| * Use #cluster for prometheus_adapteradd-clusters-to-deploymentThong Kuah2019-06-273-1/+81
| * Drop fallback to deployment platformThong Kuah2019-06-272-21/+5
| * Use deployment's cluster for kubernetes prereqThong Kuah2019-06-271-1/+3
| * Populate cluster_id when creating a deploymentThong Kuah2019-06-273-4/+16
| * Add cluster_id to deployments table as an FKThong Kuah2019-06-275-1/+36
* | Merge branch 'docs-webhooks-spacing' into 'master'Evan Read2019-07-011-25/+25
|\ \
| * | Docs: Fix spacing in code blocks in webhook raketask docMarcel Amirault2019-07-011-25/+25
|/ /
* | Merge branch 'docs-lint-rule-md004' into 'master'Evan Read2019-07-0116-256/+267
|\ \
| * | Enforce consistent prefix for bullet listsMarcel Amirault2019-07-0116-256/+267
|/ /
* | Merge branch 'small-s-in-elasticsearch' into 'master'Evan Read2019-07-015-10/+15
|\ \
| * | Fix typo in docs about ElasticsearchTakuya Noguchi2019-06-285-10/+15
* | | Merge branch 'docs/refactor-2fa' into 'master'Evan Read2019-07-015-68/+82
|\ \ \
| * | | Refactor the 2FA docsdocs/refactor-2faAchilleas Pipinellis2019-06-285-68/+82
| |/ /
* | | Merge branch 'docs/health_check' into 'master'Evan Read2019-07-011-21/+30
|\ \ \
| * | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080Russell Dickenson2019-07-011-21/+30
|/ / /
* | | Merge branch '63913-quarantine-schema-check' into 'master'Thong Kuah2019-07-011-1/+1
|\ \ \
| * | | Quarantine schema_version_check because tests after it failedLin Jen-Shin2019-07-011-1/+1
|/ / /
* | | Merge branch '63463-follow-up-from-insights-is-now-ga-docs' into 'master'Achilleas Pipinellis2019-06-293-4/+4
|\ \ \
| * | | Add a link in the docs to the epic that defined the Insights feature63463-follow-up-from-insights-is-now-ga-docsRémy Coutable2019-06-283-4/+4
* | | | Merge branch 'rs-config-settings' into 'master'Lin Jen-Shin2019-06-291-8/+136
|\ \ \ \
| * | | | Move mirror settings to their own EE blockrs-config-settingsRobert Speicher2019-06-281-3/+6
| * | | | Copy Settings initializer from EERobert Speicher2019-06-271-8/+133
* | | | | Merge branch 'check-min-schema-migrate' into 'master'Robert Speicher2019-06-286-1/+99
|\ \ \ \ \
| * | | | | Fix extra newline left by conflict resolutioncheck-min-schema-migrateDJ Mountney2019-06-281-1/+0
| * | | | | Merge branch 'master' into 'check-min-schema-migrate'DJ Mountney2019-06-28506-2936/+7520
| |\ \ \ \ \
| * | | | | | Update comments and docs around min schema versionDJ Mountney2019-06-253-2/+20
| * | | | | | Add the frozen literal to the correct fileDJ Mountney2019-06-252-2/+2
| * | | | | | Drop the source upgrade changeDJ Mountney2019-06-253-1/+5
| * | | | | | Add an flag for skipping the schema version checkDJ Mountney2019-06-255-9/+25
| * | | | | | Fix db:migrate for fresh installsDJ Mountney2019-06-251-1/+6
| * | | | | | Move min schema version check to db:migrateDJ Mountney2019-06-256-6/+41
| * | | | | | Check supported version when migratingDJ Mountney2019-06-255-1/+21
* | | | | | | Merge branch 'mh/collapsible-boards' into 'master'Mike Greiling2019-06-288-84/+168
|\ \ \ \ \ \ \
| * | | | | | | Allow collapsing all issue boardsMartin Hanzel2019-06-288-84/+168
|/ / / / / / /
* | | | | | | Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' i...Stan Hu2019-06-282-13/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix spec definitions63874-use-process-cpu-time-instead-of-thread-for-cpu-metricsAleksei Lipniagov2019-06-281-2/+2
| * | | | | | | Use PROCESS_CPUTIME_ID for cpu time metricsAleksei Lipniagov2019-06-281-11/+3
* | | | | | | | Merge branch 'vue-i18n-js-boards-directory' into 'master'Mike Greiling2019-06-2811-57/+138
|\ \ \ \ \ \ \ \
| * | | | | | | | Vue-i18n: javascripts/boards directoryEzekiel Kigbo2019-06-2811-57/+138
|/ / / / / / / /
* | | | | | | | Merge branch 'leipert-absolute-scss-paths' into 'master'Mike Greiling2019-06-2811-186/+100
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix modal related testsPaul Gascou-Vaillancourt2019-06-282-25/+12
View Lorry Controller Status