summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'docs/variables-doc-introduced-text' into 'master'Achilleas Pipinellis2019-06-241-7/+7
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and add version text to variable syntax See merge request gitlab-org/gitlab-ce!29964
| * | | | | | | | | Refactor and add version text to variable syntaxEvan Read2019-06-241-7/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'update-pagination-texts' into 'master'Kushal Pandya2019-06-244-7/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pagination prev and next texts See merge request gitlab-org/gitlab-ce!29911
| * | | | | | | | | Update pagination prev and next textsupdate-pagination-textsPaul Gascou-Vaillancourt2019-06-204-7/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-how-to-migrate-deploy-boards' into 'master'Evan Read2019-06-241-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add how to migrate deployments for deploy boards See merge request gitlab-org/gitlab-ce!29872
| * | | | | | | | | | Add how to migrate deployments for deploy boardsdocs-how-to-migrate-deploy-boardsThong Kuah2019-06-201-1/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-2413-68/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
| * | | | | | | | | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-1813-68/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* | | | | | | | | | | | Merge branch 'sh-strong-memoize-appearances' into 'master'Thong Kuah2019-06-243-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize non-existent custom appearances See merge request gitlab-org/gitlab-ce!29957
| * | | | | | | | | | | | Memoize non-existent custom appearancessh-strong-memoize-appearancesStan Hu2019-06-233-1/+25
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 5 SQL calls per page if no custom appearance is specified.
* | | | | | | | | | | | Merge branch 'docs-update-group-settings' into 'master'Evan Read2019-06-241-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Correct group path instructions See merge request gitlab-org/gitlab-ce!29869
| * | | | | | | | | | | | Correct group path instructionsdocs-update-group-settingsTristan Williams2019-06-191-3/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'Ash McKenzie2019-06-243-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly ref name caching for discussions.json See merge request gitlab-org/gitlab-ce!29951
| * | | | | | | | | | | | Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussionsStan Hu2019-06-223-1/+8
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates many potential duplicate FindCommit RPCs for the same ref, which often occurs in the RelativeLinkFilter#current_commit call. On the GitLab 12.0 release post, for example, this would save close to 400 RPC calls.
* | | | | | | | | | | | Merge branch 'sh-promote-remove-migration' into 'master'Thong Kuah2019-06-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-add ignore_column for import columns See merge request gitlab-org/gitlab-ce!29959
| * | | | | | | | | | | | Re-add ignore_column for import columnsStan Hu2019-06-231-0/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This `ignore_column` was present for a while but recently removed, but to ensure we don't get error 500s let's keep it for a while.
* | | | | | | | | | | | Merge branch 'reduce_prometheus_adapter' into 'master'Ash McKenzie2019-06-242-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve #has_metrics? and Environment#has_terminals? See merge request gitlab-org/gitlab-ce!29847
| * | | | | | | | | | | | Run least expensive method first - has_metrics?reduce_prometheus_adapterThong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Success is relatively cheap compared to prometheus_adapter which can invoke deployment_platform which does a lot of work
| * | | | | | | | | | | | Run least expensive method first - #has_terminals?Thong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available? is much cheaper than deployment_platform
| * | | | | | | | | | | | Run least expensive method firstThong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If environment is not available, then no point running the more expensive `prometheus_adapter`.
* | | | | | | | | | | | | Merge branch 'docs-variables-reference-improvement' into 'master'Evan Read2019-06-241-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: link to predefined env variables reference more evident Closes #62845 See merge request gitlab-org/gitlab-ce!29857
| * | | | | | | | | | | | Docs: link to predefined env variables reference more evidentMarcia Ramos2019-06-241-3/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Update VERSION to 12.1.0-prev12.1.0.pre12-1-auto-deploy-0011198GitLab Release Tools Bot2019-06-221-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Update CHANGELOG.md for 12.0.0GitLab Release Tools Bot2019-06-22287-1433/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch '11707-add-copy-to-clipboard-cursed-backport' into 'master'Fatih Acet2019-06-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Copy to Clipboard CE Backport See merge request gitlab-org/gitlab-ce!29906
| * | | | | | | | | | | | Add CE backport11707-add-copy-to-clipboard-cursed-backportsarahghp2019-06-201-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' ↵Mike Greiling2019-06-213-2/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Display in admin area if emails are verified or not" Closes #49814 See merge request gitlab-org/gitlab-ce!29669
| * | | | | | | | | | | | | Add verification badge to users emails49814-display-in-admin-area-if-emails-are-verified-or-notBrandon Labuschagne2019-06-203-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is being applied to the admin users view, when an admin selects a user profile tp view. It gives admins the ability to see an email verification status without the need of impersonating a user.
* | | | | | | | | | | | | | Merge branch 'app-label-warning' into 'master'Mike Greiling2019-06-218-0/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | App label warning for deploy boards See merge request gitlab-org/gitlab-ce!29740
| * | | | | | | | | | | | | | Select deployments that only has the app labelThong Kuah2019-06-218-0/+54
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Auto DevOps deployments both label and annotations, that will be included in the deploy board so need to warn at all.
* | | | | | | | | | | | | | Merge branch ↵Stan Hu2019-06-213-23/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key' into 'master' Include the GitLab version in the cache key for Gitlab::JsonCache See merge request gitlab-org/gitlab-ce!29938
| * | | | | | | | | | | | | | Add CHANGELOG entry63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-keyDouglas Barbosa Alexandre2019-06-211-0/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Include the GitLab version in the cache key for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-06-212-23/+49
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2019-06-2112-49/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade prettier to latest (v1.18.2) See merge request gitlab-org/gitlab-ce!29943
| * | | | | | | | | | | | | | | Upgrade prettier to latest (v1.18.2)Mike Greiling2019-06-2112-49/+19
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrades prettier to the latest version, and auto-corrects files with yarn prettier-all-save The diffs all seem to stem from formatting changes in brackets within template literals. Nothing major. Relevant changelogs here: https://prettier.io/blog/2019/04/12/1.17.0.html https://prettier.io/blog/2019/06/06/1.18.0.html
* | | | | | | | | | | | | | | Merge branch '42399-registry-confirm-deletion' into 'master'Tim Zallmann2019-06-2110-30/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confirmation for registry image deletion Closes #42399 See merge request gitlab-org/gitlab-ce!29505
| * | | | | | | | | | | | | | Add confirmation for registry image deletionPaul Gascou-Vaillancourt2019-06-2110-30/+167
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a modal to let the user confirm their action before proceeding to registry/image deletion
* | | | | | | | | | | | | | Merge branch 'docs/deps-gemansium' into 'master'Mike Lewis2019-06-211-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gemnasium dead link from docs See merge request gitlab-org/gitlab-ce!29942
| * | | | | | | | | | | | | | Remove Gemnasium dead link from docsAchilleas Pipinellis2019-06-211-8/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'docs-prometheus-service-discovery' into 'master'Achilleas Pipinellis2019-06-216-2/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for Prometheus Service Discovery Closes #63110 See merge request gitlab-org/gitlab-ce!29811
| * | | | | | | | | | | | | Adding documentation for Prometheus Service DiscoveryAric Buerer2019-06-216-2/+192
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating documentation to include Prometheus Service Discovery. Added monitoring node documentaiton as well as documentation for the individual service nodes.
* | | | | | | | | | | | | Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre2019-06-213-7/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid storing backtraces from Bitbucket Cloud imports in the database See merge request gitlab-org/gitlab-ce!29862
| * | | | | | | | | | | | | Avoid storing backtraces from Bitbucket Cloud imports in the databasesh-clean-up-bitbucket-import-errorsStan Hu2019-06-193-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We noticed in https://gitlab.com/gitlab-com/gl-infra/production/issues/908 some Bitbucket imports took over a second to load their projects row because `import_error` was huge due to errors. To prevent this, we now: 1. Clean the backtraces 2. Log the details into importer.log 3. Omit the details from the database
* | | | | | | | | | | | | | Merge branch '58065-uniform-html-txt-email' into 'master'Sean McGivern2019-06-219-85/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make HTML and text emails for new issues uniform and add the mail to mailer previews Closes #58065 See merge request gitlab-org/gitlab-ce!29886
| * | | | | | | | | | | | | Uniform html and text emails58065-uniform-html-txt-emailFrank van Rest2019-06-219-85/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniform new_issue_email html and text emails Uniform note_email html and text emails Uniform new_merge_request_email html and text emails
* | | | | | | | | | | | | | Merge branch 'docs/container-scanning-nfs-bug' into 'master'Mike Lewis2019-06-211-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention Container Scanning NFS bug and how to fix it Closes gitlab-ee#11429 See merge request gitlab-org/gitlab-ce!29908
| * | | | | | | | | | | | | | Mention Container Scanning NFS bug and how to fix itAchilleas Pipinellis2019-06-211-0/+20
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'docs/web-terminals-cleanup' into 'master'Mike Lewis2019-06-211-53/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the web terminals docs See merge request gitlab-org/gitlab-ce!29929
| * | | | | | | | | | | | | | Clean up the web terminals docsdocs/web-terminals-cleanupAchilleas Pipinellis2019-06-211-53/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify that they are available only for private Runners - Merge the two sections of file syncing into one
* | | | | | | | | | | | | | | Merge branch '38105-pre-release-tag' into 'master'Kushal Pandya2019-06-214-9/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797