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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Insights is now GAdocs-update-insights	Rémy Coutable	2019-06-11	4	-14/+5
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch '62813-show-inline-diff-example-rendered' into 'master'	Marcia Ramos	2019-06-11	2	-1/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Show inline diff example rendered Closes #62813 See merge request gitlab-org/gitlab-ce!29239
\| *	Replace rendered example with image	Mark Lapierre	2019-06-11	2	-1/+5
\|/ \| \| \| \|	Because the markdown wouldn't have been rendered on docs.gitlab.com
*	Merge branch '62760-use-time-zone-now' into 'master'	Rémy Coutable	2019-06-11	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_at Closes #62760 See merge request gitlab-org/gitlab-ce!29275
\| *	Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_at	Lin Jen-Shin	2019-06-11	1	-1/+2
\|/
*	Merge branch 'docs-fix-alert-box' into 'master'	Marcia Ramos	2019-06-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Use correct alert box See merge request gitlab-org/gitlab-ce!28268
\| *	Use correct alert box	Ben Bodenmiller	2019-06-11	1	-1/+1
\|/
*	Merge branch 'fix-pipeline-schedule-owner-is-nil' into 'master'	Stan Hu	2019-06-11	3	-1/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline schedule when owner is nil Closes gitlab-com/gl-infra/production#805 and #63086 See merge request gitlab-org/gitlab-ce!29477
\| *	Fix pipeline schedule when owner is nilfix-pipeline-schedule-owner-is-nil	Shinya Maeda	2019-06-11	3	-1/+14
\| \| \| \| \| \| \| \|	Fixing the bug
* \|	Merge branch 'docs/architecture-table-hack' into 'master'	Marcia Ramos	2019-06-11	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the architecture table displayed in a block Closes #62990 See merge request gitlab-org/gitlab-ce!29470
\| * \|	Make the architecture table displayed in a blockdocs/architecture-table-hack	Achilleas Pipinellis	2019-06-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By default, all tables have a width of 100% on docs.gitlab.com. In a few cases, the table will overlap the table of contents (ToC). For these cases, we need to add an entry to the document’s frontmatter to render them as a display block.
* \| \|	Merge branch 'docs/subscriptions-ce-port' into 'master'	Mike Lewis	2019-06-11	1	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port the subscriptions docs to CE See merge request gitlab-org/gitlab-ce!29484
\| * \| \|	Port the subscriptions docs to CEdocs/subscriptions-ce-port	Achilleas Pipinellis	2019-06-11	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12072/diffs
* \| \| \|	Merge branch 'jv-go-1.11.10' into 'master'	Achilleas Pipinellis	2019-06-11	2	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Go 1.11.10 in source installations See merge request gitlab-org/gitlab-ce!29471
\| * \| \| \|	Use Go 1.11.10 in source installations	Jacob Vosmaer	2019-06-11	2	-8/+8
\|/ / / /
* \| \| \|	Merge branch 'docs-bulk-migrate-issues' into 'master'	Tom Atkins	2019-06-11	1	-0/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding documentation on how to bulk migrate issues See merge request gitlab-org/gitlab-ce!24530
\| * \| \| \|	Adding documentation on how to bulk migrate issuesdocs-bulk-migrate-issues	mac-key	2019-01-21	1	-0/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch '62622-constrain-parent' into 'master'	Fatih Acet	2019-06-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline dropdown overflow Closes #62622 See merge request gitlab-org/gitlab-ce!29443
\| * \| \| \| \|	Constrain parent so trunc works62622-constrain-parent	sarahghp	2019-06-10	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-target-project-and-branch-to-merge-trains' into 'master'	Kamil Trzciński	2019-06-11	2	-1/+19
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist target project id and target branch in merge trains table See merge request gitlab-org/gitlab-ce!29466
\| * \| \| \| \|	Persist target project id and target branch in merge trains table	Shinya Maeda	2019-06-11	2	-1/+19
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to optimize the query performance, we should use target project id and target branch intead of cross-joining merge_requests table. Fix schema Fix schema
* \| \| \| \|	Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'	James Lopez	2019-06-11	4	-1/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore legacy artifact columns in Project Import/Export Closes #63033 See merge request gitlab-org/gitlab-ce!29427
\| * \| \| \| \|	Ignore legacy artifact columns in Project Import/Export	Shinya Maeda	2019-06-11	4	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore some columns
* \| \| \| \| \|	Merge branch 'fix-diff-system-note-alignment' into 'master'	Filipa Lacerda	2019-06-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix system note alignment within diff See merge request gitlab-org/gitlab-ce!29446
\| * \| \| \| \| \|	Fix system note alignment within difffix-diff-system-note-alignment	Annabel Dunstone Gray	2019-06-10	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '58882-explicit-chrome-data-dir' into 'master'	Thong Kuah	2019-06-11	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly set Chrome user-data-dir See merge request gitlab-org/gitlab-ce!29459
\| * \| \| \| \| \|	Explicitly set Chrome user-data-dir58882-explicit-chrome-data-dir	Heinrich Lee Yu	2019-06-11	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a temporary measure to prevent some system specs causing Chrome to crash
* \| \| \| \| \| \|	Merge branch 'prom-api-1' into 'master'	Sean McGivern	2019-06-11	12	-18/+94
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update server API to enable switch prometheus endpoint See merge request gitlab-org/gitlab-ce!29186
\| * \| \| \| \| \| \|	Switch errors to inherit from a base classprom-api-1	syasonik	2019-06-06	5	-25/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Error classes associated with individual stages of dashboard processing tend to have very long names. As dashboard post-processing includes more steps, we will likely need to handle more error cases. Refactoring to have all errors inherit from a specific base class will help accommodate this and keep the code more readable.
\| * \| \| \| \| \| \|	Address rubocop errors	syasonik	2019-06-06	2	-3/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Expose prometheus endpoint per metric in dashboard	syasonik	2019-06-06	8	-8/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a new stage to dashboard processesing step for the EnvironmentsController::metrics_dashboard endpoint. Allows the front end to avoid generating the endpoint unitutive string mutations.
\| * \| \| \| \| \| \|	Named route for prometheus proxy_path	Simon Knox	2019-06-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Return no_content from prometheus API empty response	Simon Knox	2019-06-06	2	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-default-reactive-cache-key' into 'master'	Nick Thomas	2019-06-11	5	-5/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a default reactive cache key See merge request gitlab-org/gitlab-ce!29337
\| * \| \| \| \| \| \| \|	Add a default reactive cache keyadd-default-reactive-cache-key	Tiger	2019-06-07	5	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aligns with the other reactive cache options by providing a default that can be overridden if necessary.
* \| \| \| \| \| \| \| \|	Merge branch 'add-eread-as-codeowner-doc' into 'master'	Achilleas Pipinellis	2019-06-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add eread as CODEOWNER for doc dir See merge request gitlab-org/gitlab-ce!29456
\| * \| \| \| \| \| \| \| \|	Add eread as CODEOWNER for doc dir	Evan Read	2019-06-11	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'	Filipa Lacerda	2019-06-11	11	-2/+87
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add LFS blob IDs to GraphQL tree type See merge request gitlab-org/gitlab-ce!28666
\| * \| \| \| \| \| \| \|	Add LFS blob ID to GraphQL blob type	Phil Hughes	2019-06-10	11	-2/+87
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/ssot-university-topics' into 'master'	Achilleas Pipinellis	2019-06-11	42	-775/+266
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSoT audit fixes for some topics in GitLab U section Closes #61513 See merge request gitlab-org/gitlab-ce!29033
\| * \| \| \| \| \| \| \| \|	SSoT audit fixes for GitLab U topics	Evan Read	2019-06-11	42	-775/+266
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improves the markdown in that section.
* \| \| \| \| \| \| \| \|	Merge branch 'dz-cleanup-deprecated-code' into 'master'	Kamil Trzciński	2019-06-11	9	-61/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some deprecated code See merge request gitlab-org/gitlab-ce!29222
\| * \| \| \| \| \| \| \| \|	Remove some deprecated codedz-cleanup-deprecated-code	Dmitriy Zaporozhets	2019-06-07	9	-61/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'process-when-auto-merge-is-enabled' into 'master'	Kamil Trzciński	2019-06-11	2	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notify events when auto merge is enabled or merge param is updated See merge request gitlab-org/gitlab-ce!29415
\| * \| \| \| \| \| \| \| \|	Notify when auto merge is enabledprocess-when-auto-merge-is-enabled	Shinya Maeda	2019-06-10	2	-0/+13
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are bunch of auto merge related notifications, and when auto merge is enabled, it should be evaluated immediately.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'	Dmitriy Zaporozhets	2019-06-11	3	-4/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UTF-8 conversion issues when resolving conflicts Closes #63062 See merge request gitlab-org/gitlab-ce!29453
\| * \| \| \| \| \| \| \| \|	Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflicts	Stan Hu	2019-06-10	2	-10/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix UTF-8 conversion issues when resolving conflicts	Stan Hu	2019-06-10	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030, when the commit message in the /resolve_conflicts endpoint contains a UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag an error. To fix this, we run `force_encoding` on the commit message. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-ml-dry-retry-on-exception' into 'master'	Sanad Liaquat	2019-06-11	1	-9/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] use `retry_on_exception` instead of duplicating code See merge request gitlab-org/gitlab-ce!29452
\| * \| \| \| \| \| \| \| \| \|	DRY exception handlingqa-ml-dry-retry-on-exception	Mark Lapierre	2019-06-11	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `retry_on_exception` instead of duplicating code