Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'config-yaml-differences' into 'master' | Robert Speicher | 2019-06-20 | 10 | -11/+293 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Backport gitlab.yml.example from EEconfig-yaml-differences | Yorick Peterse | 2019-06-20 | 6 | -9/+258 | |
| * | | | | | | | | | | | | | | | | | Backport Prometheus YAML config from EE | Yorick Peterse | 2019-06-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | Backport Sidekiq queue names from EE | Yorick Peterse | 2019-06-20 | 1 | -0/+17 | |
| * | | | | | | | | | | | | | | | | | Backport dependency decisions from EE | Yorick Peterse | 2019-06-19 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | Backport EE YAML settings for PostgreSQL | Yorick Peterse | 2019-06-19 | 1 | -0/+9 | |
* | | | | | | | | | | | | | | | | | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' i... | Sean McGivern | 2019-06-20 | 28 | -68/+117 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Update application settings using correct action | Brett Walker | 2019-06-19 | 28 | -68/+117 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-failing-master-graphql-import' into 'master' | Sean McGivern | 2019-06-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Fixed failing GraphQL file import | Phil Hughes | 2019-06-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'severity-doc-update' into 'master' | Mek Stittri | 2019-06-20 | 1 | -26/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Improve bug severity definitions and consolidate guidance for clarity | Mek Stittri | 2019-06-20 | 1 | -26/+26 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'embedded-metrics-be' into 'master' | Sean McGivern | 2019-06-20 | 10 | -17/+196 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Add embedding flag and filter to CPU/Mem | Sarah Yasonik | 2019-06-20 | 10 | -17/+196 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'last-commit-repo-widget' into 'master' | Filipa Lacerda | 2019-06-20 | 6 | -0/+397 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Render tree last commit widget with Vue | Phil Hughes | 2019-06-19 | 6 | -0/+397 | |
* | | | | | | | | | | | | | | | | | | | Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'mas... | Ash McKenzie | 2019-06-20 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncache | Ash McKenzie | 2019-06-20 | 2 | -1/+11 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'master-i18n' into 'master' | Bob Van Landuyt | 2019-06-20 | 45 | -1209/+2829 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | New translations gitlab.pot (Portuguese) | Luke Bennett | 2019-06-20 | 45 | -1209/+2829 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'link_to_issue_statistics_api_endpoint_in_docs' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Link issue statistics api endpoint in the docslink_to_issue_statistics_api_endpoint_in_docs | Alexandru Croitor | 2019-06-20 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs-update-container-registry-api' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Update Docs for Container Registry API Delete Endpoints | Jason Goodman | 2019-06-20 | 1 | -0/+5 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/existing-knative-edit' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -4/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Add version text and edit section | Evan Read | 2019-06-20 | 1 | -4/+14 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/edit-zoom-call-link-content' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Edit new Zoom call link content | Evan Read | 2019-06-20 | 1 | -2/+9 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'graphql-file-renames' into 'master' | Kushal Pandya | 2019-06-20 | 11 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Rename graphql files to match frontend docs | Phil Hughes | 2019-06-19 | 11 | -6/+6 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-registry-restore-workaround' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Document the workaround for issues after registry restore | DJ Mountney | 2019-06-20 | 1 | -0/+31 | |
|/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-remove-import-columns-from-projects' into 'master' | Douwe Maan | 2019-06-20 | 5 | -8/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Remove import columns from projects tablesh-remove-import-columns-from-projects | Stan Hu | 2019-06-19 | 5 | -8/+22 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-markdown-graphql' into 'master' | Douwe Maan | 2019-06-20 | 19 | -19/+207 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Render GFM html in GraphQL | Bob Van Landuyt | 2019-06-20 | 19 | -19/+207 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master' | Stan Hu | 2019-06-20 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fix(favicon): get favicon_path, so it works also with uploads object store | Roger Meier | 2019-06-14 | 2 | -6/+7 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'expose-saml-provider-id-to-users-api' into 'master' | Stan Hu | 2019-06-19 | 5 | -25/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Updating CE repo to include new EE users API changes | Michael Leopard | 2019-06-19 | 5 | -25/+37 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-gitaly-without-nfs' into 'master' | Mike Lewis | 2019-06-19 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Minor edits to Eliminating NFS section | Mike Lewis | 2019-06-19 | 1 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | Prefer cd path over ee path in docs linksdocs-gitaly-without-nfs | Diana Stanley | 2019-06-18 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | Modify to conform to style guide | Diana Stanley | 2019-06-18 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | Update gitaly docs to enumerate how to eliminate NFS altogether | Diana Stanley | 2019-06-18 | 1 | -0/+18 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-jobs-controller-index-n-1' into 'master' | Stan Hu | 2019-06-19 | 4 | -5/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Fix N+1 problem in `JobsController#index`fix-jobs-controller-index-n-1 | Kamil TrzciĆski | 2019-06-19 | 4 | -5/+81 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch '9490-static-gitattributes-for-design-repos-ce' into 'master' | Mayra Cabrera | 2019-06-19 | 3 | -7/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | CE backport for changes in EE MR 14017 | Luke Duncalfe | 2019-06-19 | 3 | -7/+24 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch '63227-fix-double-border' into 'master' | Annabel Dunstone Gray | 2019-06-19 | 3 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |