delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Vue-i18n: disable eslint rulesvue-i18n-eslint-disable-false-positives	Ezekiel Kigbo	2019-06-24	5	-1/+14
\| \| \| \|	disabling eslint for some known false positives
*	Merge branch 'docs-update-group-settings' into 'master'	Evan Read	2019-06-24	1	-3/+4
\|\ \| \| \| \| \| \| \| \|	Docs: Correct group path instructions See merge request gitlab-org/gitlab-ce!29869
\| *	Correct group path instructionsdocs-update-group-settings	Tristan Williams	2019-06-19	1	-3/+4
\| \|
* \|	Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'	Ash McKenzie	2019-06-24	3	-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-discussions	Stan Hu	2019-06-22	3	-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 Kuah	2019-06-24	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-add ignore_column for import columns See merge request gitlab-org/gitlab-ce!29959
\| * \| \|	Re-add ignore_column for import columns	Stan Hu	2019-06-23	1	-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 McKenzie	2019-06-24	2	-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_adapter	Thong Kuah	2019-06-20	1	-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 Kuah	2019-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	available? is much cheaper than deployment_platform
\| * \| \| \|	Run least expensive method first	Thong Kuah	2019-06-20	1	-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 Read	2019-06-24	1	-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 evident	Marcia Ramos	2019-06-24	1	-3/+5
\|/ / / /
* \| \| \|	Update VERSION to 12.1.0-prev12.1.0.pre 12-1-auto-deploy-0011198	GitLab Release Tools Bot	2019-06-22	1	-1/+1
\| \| \| \|
* \| \| \|	Update CHANGELOG.md for 12.0.0	GitLab Release Tools Bot	2019-06-22	287	-1433/+310
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch '11707-add-copy-to-clipboard-cursed-backport' into 'master'	Fatih Acet	2019-06-21	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Copy to Clipboard CE Backport See merge request gitlab-org/gitlab-ce!29906
\| * \| \| \|	Add CE backport11707-add-copy-to-clipboard-cursed-backport	sarahghp	2019-06-20	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' ↵	Mike Greiling	2019-06-21	3	-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-not	Brandon Labuschagne	2019-06-20	3	-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 Greiling	2019-06-21	8	-0/+54
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	App label warning for deploy boards See merge request gitlab-org/gitlab-ce!29740
\| * \| \| \| \| \|	Select deployments that only has the app label	Thong Kuah	2019-06-21	8	-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 Hu	2019-06-21	3	-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-key	Douglas Barbosa Alexandre	2019-06-21	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Include the GitLab version in the cache key for Gitlab::JsonCache	Douglas Barbosa Alexandre	2019-06-21	2	-23/+49
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mg-upgrade-prettier' into 'master'	Clement Ho	2019-06-21	12	-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 Greiling	2019-06-21	12	-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 Zallmann	2019-06-21	10	-30/+167
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confirmation for registry image deletion Closes #42399 See merge request gitlab-org/gitlab-ce!29505
\| * \| \| \| \| \|	Add confirmation for registry image deletion	Paul Gascou-Vaillancourt	2019-06-21	10	-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 Lewis	2019-06-21	1	-8/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Gemnasium dead link from docs See merge request gitlab-org/gitlab-ce!29942
\| * \| \| \| \| \|	Remove Gemnasium dead link from docs	Achilleas Pipinellis	2019-06-21	1	-8/+8
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-prometheus-service-discovery' into 'master'	Achilleas Pipinellis	2019-06-21	6	-2/+192
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for Prometheus Service Discovery Closes #63110 See merge request gitlab-org/gitlab-ce!29811
\| * \| \| \| \|	Adding documentation for Prometheus Service Discovery	Aric Buerer	2019-06-21	6	-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 Alexandre	2019-06-21	3	-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-errors	Stan Hu	2019-06-19	3	-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 McGivern	2019-06-21	9	-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-email	Frank van Rest	2019-06-21	9	-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 Lewis	2019-06-21	1	-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 it	Achilleas Pipinellis	2019-06-21	1	-0/+20
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/web-terminals-cleanup' into 'master'	Mike Lewis	2019-06-21	1	-53/+43
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up the web terminals docs See merge request gitlab-org/gitlab-ce!29929
\| * \| \| \| \| \| \|	Clean up the web terminals docsdocs/web-terminals-cleanup	Achilleas Pipinellis	2019-06-21	1	-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 Pandya	2019-06-21	4	-9/+39
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797
\| * \| \| \| \| \| \| \|	Renders pre-release tag for pre-releases38105-pre-release-tag	Filipa Lacerda	2019-06-21	4	-9/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a release is a pre release, we render an orange badge with `pre-release` label
* \| \| \| \| \| \| \| \|	Merge branch 'patch-71' into 'master'	Stan Hu	2019-06-21	2	-7/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rouge See merge request gitlab-org/gitlab-ce!29541
\| * \| \| \| \| \| \| \| \|	Bump rouge to 3.4.1	Zoid	2019-06-21	2	-7/+8
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-341-2019-06-13
* \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-06-21	4	-11/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master' Fix copying a single line from Firefox Closes #63406 See merge request gitlab-org/gitlab-ce!29832
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into ↵63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also	Adam Hegyi	2019-06-19	54	-101/+198
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' # Conflicts: # spec/lib/gitlab/ci/ansi2html_spec.rb
\| * \| \| \| \| \| \| \| \| \|	Fix copying a single line from Firefox	Adam Hegyi	2019-06-19	4	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change ensures that all open <span> tags are closed before adding a <br> tag.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bw-issue-reorder' into 'master'	Kamil Trzciński	2019-06-21	8	-3/+257
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
\| * \| \| \| \| \| \| \| \| \| \|	Add reorder action to Project IssuesControllerbw-issue-reorder	Brett Walker	2019-06-21	8	-3/+257
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to support manual sorting on the frontend
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-group-packages-page-ce' into 'master'	Filipa Lacerda	2019-06-21	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add packages nav to group sidebar [CE backport] See merge request gitlab-org/gitlab-ce!29592