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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added description of `diff` viewdocs/add_file_diff_description	Russell Dickenson	2019-09-06	3	-0/+22
\|
*	Merge branch '66393-proposal-remove-area-chart-in-favor-of-time-series' into ↵66914-security-dashboard-component-replace-main-tag-with-article-tag	Tim Zallmann	2019-09-02	2	-569/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove area chart in favor of time series Closes #66393 See merge request gitlab-org/gitlab-ce!32129
\| *	Remove area.vue component66393-proposal-remove-area-chart-in-favor-of-time-series	Miguel Rincon	2019-08-24	2	-569/+0
\| \|
* \|	Merge branch 'cluster-form-ca-cert-larger' into 'master'	Tim Zallmann	2019-09-02	3	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Expand textarea for CA cert in cluster form See merge request gitlab-org/gitlab-ce!32508
\| * \|	Expand textarea for CA cert in cluster formcluster-form-ca-cert-larger	Thong Kuah	2019-09-02	3	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current default is too small for a user to see what they have pasted in.
* \| \|	Merge branch 'add-notification-reason-to-note-emails' into 'master'	Mayra Cabrera	2019-09-02	4	-13/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add X-GitLab-NotificationReason header to note emails See merge request gitlab-org/gitlab-ce!32422
\| * \| \|	Add X-GitLab-NotificationReason header to note emailsadd-notification-reason-to-note-emails	Sean McGivern	2019-09-02	4	-13/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'assigned' reason doesn't apply to notes, but the other two can ('mentioned' and 'own_activity'), so we can still use this for note emails.
* \| \| \|	Merge branch 'qa-add-built-in-project-template-test-ce' into 'master'	Walmyr Lima e Silva Filho	2019-09-02	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes for built-in project template test See merge request gitlab-org/gitlab-ce!32358
\| * \| \| \|	Backport EE changes for built-in project template testqa-add-built-in-project-template-test-ce	Desiree Chevalier	2019-08-30	2	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'pl-project-service-filename-lineo' into 'master'	Lin Jen-Shin	2019-09-02	2	-9/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide filename and line number for `class_eval` See merge request gitlab-org/gitlab-ce!32500
\| * \| \| \|	Provide filename and line number for `class_eval`	Peter Leitzen	2019-09-02	2	-9/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	This commit removes one RuboCop offense from its todo file.
* \| \| \|	Merge branch 'patch-74' into 'master'	Achilleas Pipinellis	2019-09-02	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clarify config value true is a string See merge request gitlab-org/gitlab-ce!32209
\| * \| \| \|	Update `true` with `"true"`	yonatan miller	2019-09-02	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab CI Linter otherwise gives error `variables config should be a hash value of key value pairs`
* \| \| \|	Merge branch 'sh-suppress-diverging-count-commits-request' into 'master'	Filipa Lacerda	2019-09-02	3	-1/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip requesting diverging commit counts if no branches are listed See merge request gitlab-org/gitlab-ce!32496
\| * \| \| \|	Update Mermaid to v8.2.6	Stan Hu	2019-09-02	3	-1/+23
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a regression where an underscore in labels no longer worked: https://github.com/knsv/mermaid/releases
* \| \| \|	Merge branch 'use-only-ref-in-the-code-quality-job-template' into 'master'	Douglas Barbosa Alexandre	2019-09-02	1	-2/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Code-Quality.gitlab-ci.yml to use `only.refs` See merge request gitlab-org/gitlab-ce!32394
\| * \| \| \|	Update Code-Quality.gitlab-ci.yml to use `only.refs`	Rémy Coutable	2019-09-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows overriding `only.refs` to something else if needed.
* \| \| \| \|	Merge branch 'use-atlassian-jwt-gem-ce' into 'master'	Stan Hu	2019-09-02	2	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Use atlassian-jwt-ruby gem See merge request gitlab-org/gitlab-ce!32519
\| * \| \| \|	Add atlassian-jwt gem explicitly	Heinrich Lee Yu	2019-09-02	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is used by the Jira integration in EE
* \| \| \| \|	Merge branch 'ab-admin-page-user-active-count' into 'master'	Andreas Brandl	2019-09-02	0	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace indexes for counting active users See merge request gitlab-org/gitlab-ce!32538
* \ \ \ \ \	Merge branch 'ab-admin-page-user-active-count' into 'master'	Andreas Brandl	2019-09-02	3	-2/+31
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace indexes for counting active users See merge request gitlab-org/gitlab-ce!32538
\| * \| \| \| \|	Replace indexes for counting active usersab-admin-page-user-active-count	Andreas Brandl	2019-09-02	3	-2/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adjusts the partial condition for an index. The index is intended to be used when counting active users with `ghost IS NOT TRUE AND bot_type IS NULL`. With the current index, this wasn't working as the partial condition didn't match the query: `ghost <> TRUE` is not semantically equivalent to `ghost IS NOT TRUE` (null semantics). The reason we add an index particularly intended for EE is that the EE query is going to have the additional part `AND bot_type IS NULL` whereas the CE query doesn't. Logically, it'd be enough to have an index for `ghost IS NOT TRUE`. However, on GitLab.com, the query planner makes poor choices when the additional `AND bot_type IS NULL` part is present: It goes for the index on `bot_type` and doesn't use the partial index. Note the existing index isn't being used at all according to GitLab.com index statistics. Hence we can first remove it and don't have to worry about the window of time without an index. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66770
* \| \| \| \| \|	Merge branch '66791-handle-different-listen-address-formats' into 'master'	Sean McGivern	2019-09-02	3	-40/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle :9090 and 0.0.0.0:9090 listen_address formats See merge request gitlab-org/gitlab-ce!32456
\| * \| \| \| \| \|	Handle :9090 and 0.0.0.0:9090 listen_address formats	Reuben Pereira	2019-09-02	3	-40/+42
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090. But before these can be used to connect a project to Prometheus, they have to converted into absolute URIs.
* \| \| \| \| \|	Update CHANGELOG.md for 12.2.4	GitLab Release Tools Bot	2019-09-02	9	-40/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'docs/license-compliance' into 'master'	Marcia Ramos	2019-09-02	10	-5/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update screenshots for License Compliance Closes gitlab-ee#8910 See merge request gitlab-org/gitlab-ce!32537
\| * \| \| \| \|	Update screenshots for License Compliancedocs/license-compliance	Achilleas Pipinellis	2019-09-02	10	-5/+5
\| \|/ / / /
* \| \| \| \|	Merge branch '65152-unfolded-lines-perf-improvement' into 'master'	Douwe Maan	2019-09-02	4	-7/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support selective highlighting of lines See merge request gitlab-org/gitlab-ce!32514
\| * \| \| \| \|	Support selective highlighting of lines65152-unfolded-lines-perf-improvement	Patrick Bajao	2019-09-02	4	-7/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of highlighting all lines when not all of them are needed, only highlight from the beginning up to the specified limit. The `BlobPresenter#highlight` method has been updated to support `to` param. This param will be used to limit the content to be highlighted.
* \| \| \| \| \|	Merge branch 'docs-maven-repo-cli-credentials' into 'master'	Achilleas Pipinellis	2019-09-02	1	-0/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added example for passing Maven repo credentials Closes gitlab-ee#6711 See merge request gitlab-org/gitlab-ce!32073
\| * \| \| \| \| \|	Added example for passing Maven repo credentials	Matt Penna	2019-09-02	1	-0/+15
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-james-gill-contribution' into 'master'	Achilleas Pipinellis	2019-09-02	1	-26/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs james gill contribution See merge request gitlab-org/gitlab-ce!32520
\| * \| \| \| \| \|	Docs james gill contribution	Marcel Amirault	2019-09-02	1	-26/+23
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'pl-fix-chat-notification-service' into 'master'	Stan Hu	2019-09-02	1	-6/+13
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Reduce amount of property definitions in ChatNotificationService See merge request gitlab-org/gitlab-ce!32363
\| * \| \| \| \|	Reduce amount of property definitions in ChatNotificationService	Peter Leitzen	2019-09-02	1	-6/+13
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit we redefined properties for supported events on each new instance of ChatNotificationService during "runtime". This commit defines the properties only once during "compile time".
* \| \| \| \|	Merge branch '66803-fix-uploads-relative-link-filter' into 'master'	Grzegorz Bizon	2019-09-02	4	-101/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix permissions check in `RelativeLinkFilter` See merge request gitlab-org/gitlab-ce!32448
\| * \| \| \| \|	Fix upload URLs in Markdown66803-fix-uploads-relative-link-filter	Heinrich Lee Yu	2019-09-02	4	-101/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes RelativeLinkFilter for users that don't have access to the project's repository
* \| \| \| \| \|	Merge branch 'qa/e2e-test-custom-email' into 'master'66360-zoom-for-incident-management-integration	Rémy Coutable	2019-09-02	5	-4/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update views for testability and update page objects See merge request gitlab-org/gitlab-ce!32451
\| * \| \| \| \| \|	Improve tests speedqa/e2e-test-custom-email	Walmyr Lima	2019-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this change, by default the expand button would only be clicked after 10 seconds, but now it will only wait for 1 sec.
\| * \| \| \| \| \|	Update page object with new element and method	Walmyr Lima	2019-08-30	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update views for testability	Walmyr Lima	2019-08-30	3	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mdhtr_swagger-ui-ci-page-template' into 'master'	Nick Thomas	2019-09-02	2	-0/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI Pages template to display static OpenAPI specification files in SwaggerUI See merge request gitlab-org/gitlab-ce!31183
\| * \| \| \| \| \| \|	Remove reference of external example	mdhtr	2019-09-02	2	-0/+34
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as requested by the reviewer
* \| \| \| \| \| \|	Merge branch ↵	Nick Thomas	2019-09-02	7	-6/+43
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65389_wrong_format_on_ms_teams_integration_push_events_with_multi_line_commit_messages' into 'master' Fixing #65389 - Wrong format on MS teams integration push events with multi line commit messages Closes #65389 See merge request gitlab-org/gitlab-ce!32180
\| * \| \| \| \| \| \|	Fixing #65389	Massimeddu Cireddu	2019-09-02	7	-6/+43
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrong format on MS Teams integration push events with multi line commit messages
* \| \| \| \| \| \|	Merge branch '60561-quick-action-label-first-for-issue' into 'master'	Nick Thomas	2019-09-02	3	-1/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quick action label must be first in issue comment Closes #60561 See merge request gitlab-org/gitlab-ce!32367
\| * \| \| \| \| \| \|	quick action label must be first in issue comment	Maneschi Romain	2019-09-02	3	-1/+23
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '14756-move-shared-examples' into 'master'	Grzegorz Bizon	2019-09-02	2	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename shared examples according to our guidelines Closes gitlab-ee#14316 See merge request gitlab-org/gitlab-ce!32526
\| * \| \| \| \| \| \|	Rename shared examples according to our guidelines14756-move-shared-examples	Rémy Coutable	2019-09-02	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'winh-ci-lint-javascript-report' into 'master'	Kushal Pandya	2019-09-02	2	-21/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove lint:javascript:report job See merge request gitlab-org/gitlab-ce!32462