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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge EE docs into CEdocs/ee-to-ce	Achilleas Pipinellis	2019-03-12	634	-665/+20964
\|
*	Merge branch ↵	Nick Thomas	2019-03-12	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project' into 'master' Fix UI for closed MR when source project is removed Closes #58797 See merge request gitlab-org/gitlab-ce!25967
\| *	Fix UI for closed MR when source project is removed	Takuya Noguchi	2019-03-11	2	-1/+6
\| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \|	Merge branch 'tag-pipeline-asset-image' into 'master'	Rémy Coutable	2019-03-12	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Tag asset docker image with GitLab version also See merge request gitlab-org/gitlab-ce!26029
\| * \|	Tag asset docker image with GitLab version also	Balasankar "Balu" C	2019-03-12	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \| \|	Merge branch 'qa-quarantine-add-member-test' into 'master'	Sanad Liaquat	2019-03-12	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing test See merge request gitlab-org/gitlab-ce!26028
\| * \| \|	Quarantine failing test	Mark Lapierre	2019-03-12	1	-1/+2
\| \|/ /
* \| \|	Merge branch 'gitaly-version-v1.28.0' into 'master'	Douwe Maan	2019-03-12	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.28.0 See merge request gitlab-org/gitlab-ce!26026
\| * \| \|	Upgrade Gitaly to v1.28.0	GitalyBot	2019-03-12	2	-1/+6
\|/ / /
* \| \|	Merge branch '58789-some-system-notes-on-issuable-are-folded-on-mobile' into ↵	Annabel Dunstone Gray	2019-03-12	4	-37/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Keep inline as much as possible in system notes on issuable Closes #58789 See merge request gitlab-org/gitlab-ce!25968
\| * \| \|	Keep inline as much as possible in system notes on issuable	Takuya Noguchi	2019-03-12	4	-37/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Merge branch '58781-silent-progress-in-auto-devops' into 'master'	Kamil Trzciński	2019-03-12	2	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use curl silent/show-error options on Auto DevOps' deploy Closes #58781 See merge request gitlab-org/gitlab-ce!25954
\| * \| \| \|	Use curl silent/show-error options on Auto DevOps	Takuya Noguchi	2019-03-11	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \|	Merge branch 'ce-9826-fix-broken-downstreams' into 'master'	Kamil Trzciński	2019-03-12	2	-3/+17
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port for expanded pipelines See merge request gitlab-org/gitlab-ce!25859
\| * \| \| \|	CE port for expanded pipelines	Filipa Lacerda	2019-03-07	2	-3/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-ide-web-worker-relative-url' into 'master'	Filipa Lacerda	2019-03-12	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed Web IDE web workers not loading with relative root URL Closes #50451 See merge request gitlab-org/gitlab-ce!26015
\| * \| \| \| \|	Fixed Web IDE web workers not loading with relative root URL	Phil Hughes	2019-03-12	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50451
* \| \| \| \| \|	Merge branch 'revert-b923d1b5' into 'master'	Sean McGivern	2019-03-12	1	-19/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'check_pg_stat_activity' into 'master'" See merge request gitlab-org/gitlab-ce!26016
\| * \| \| \| \| \|	Revert "Merge branch 'check_pg_stat_activity' into 'master'"	Thong Kuah	2019-03-12	1	-19/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25723
* \| \| \| \| \| \|	Merge branch '52447-auto-devops-at-group-level' into 'master'	Kamil Trzciński	2019-03-12	25	-38/+789
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable/disable Auto DevOps at the Group level Closes #52447 See merge request gitlab-org/gitlab-ce!25533
\| * \| \| \| \| \| \|	Enable/disable Auto DevOps at Group level	Mayra Cabrera	2019-03-12	25	-38/+789
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Includes instance methods on Group model to detect when a group has AutoDevOps explicitly/implicitly enabled/disabled. - Includes migration to add a new column to namespaces table - Add UI necessary modifications - Add service and controller to update auto devops related instances - Updates project and groups auto devops badges Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52447
* \| \| \| \| \| \|	Merge branch 'renovate/gitlab-ui-2.x' into 'master'	Phil Hughes	2019-03-12	2	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^2.2.3 See merge request gitlab-org/gitlab-ce!25977
\| * \| \| \| \| \| \|	Update dependency @gitlab/ui to ^2.2.3	Lukas 'Eipi' Eipert	2019-03-11	2	-5/+5
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-store-rspec-profiling-csv' into 'master'	Rémy Coutable	2019-03-12	3	-16/+87
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch insert CI profiling spec data Closes gitlab-ee#10154 See merge request gitlab-org/gitlab-ce!25937
\| * \| \| \| \| \|	Batch insert CI rspec_profiling data	Stan Hu	2019-03-12	3	-16/+87
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of inserting a row after each example to an external database, we save the CI profiling reports into the `rspec_profiling` directory and insert the data in the update-tests-metadata CI stage. This should make each spec run faster and also reduce the number of PostgreSQL connections needed by concurrent CI builds. `scripts/insert-rspec-profiling-data` also inserts one file at a time via the PostgreSQL COPY command for faster inserts. The one side effect is that the `created_at` and `updated_at` timestamps aren't available since they aren't generated in the CSV. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
* \| \| \| \| \|	Merge branch 'fix-emojis-fixture-creating-ee-specific-file' into 'master'	Lin Jen-Shin	2019-03-12	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't create EE-specific files when creating Emojis fixture files See merge request gitlab-org/gitlab-ce!26011
\| * \| \| \| \| \|	Don't create EE-specific files when creating Emojis fixture files	Rémy Coutable	2019-03-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'label-issues-and-merge-requests-in-seeds' into 'master'	Lin Jen-Shin	2019-03-12	6	-106/+60
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new dedicated labels seeder script and automatically add labels to seeded issues and merge requests See merge request gitlab-org/gitlab-ce!25974
\| * \| \| \| \| \|	Add labels to seeded issues and merge requests	Rémy Coutable	2019-03-12	6	-106/+60
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '10080-env-contaier' into 'master'	Phil Hughes	2019-03-12	2	-5/+44
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes ee differences for container.vue Closes gitlab-ee#10080 See merge request gitlab-org/gitlab-ce!25957
\| * \| \| \| \| \|	Removes ee differences for container.vue	Filipa Lacerda	2019-03-11	2	-5/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates a mixin to include the ee only properties
* \| \| \| \| \| \|	Merge branch '58671-build-qa-image-should-have-a-higher-git-clone-depth' ↵	Lin Jen-Shin	2019-03-12	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Build QA image should have a higher git clone depth" Closes #58671 See merge request gitlab-org/gitlab-ce!25959
\| * \| \| \| \| \| \|	Increase Git clone depth to 50 for the build-qa-image job	Rémy Coutable	2019-03-12	1	-0/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '10029-env-item' into 'master'	Phil Hughes	2019-03-12	4	-1/+32
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences from environment_item Closes gitlab-ee#10029 See merge request gitlab-org/gitlab-ce!25930
\| * \| \| \| \| \|	Removes EE differences from environmnet_item	Filipa Lacerda	2019-03-11	4	-1/+32
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creares a mixin & moves the EE template differences into CE
* \| \| \| \| \|	Merge branch 'docs-fix-convdev-note' into 'master'	Evan Read	2019-03-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix convdev note alert box See merge request gitlab-org/gitlab-ce!25984
\| * \| \| \| \| \|	Fix note alert box in convdev doc	Caleb Williamson	2019-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `note` alert box within the convdev doc was improperly formatted.
* \| \| \| \| \| \|	Merge branch 'olliverschinagl/gitlab-ce-clarify_master_branch_name' into ↵	Evan Read	2019-03-12	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Olliverschinagl/gitlab ce clarify master branch name See merge request gitlab-org/gitlab-ce!25965
\| * \| \| \| \| \| \|	doc Clarify the special branch 'master'	Toon Claes	2019-03-12	1	-1/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'master' branch name is confusing as it indicates some special branch name, where it is actually just a 'ref'. 'branches' _is_ a special name as it indicates 'all' branches. Lets clarify the example a little to indicate this. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
* \| \| \| \| \| \|	Merge branch 'mc/docs/trigger-token-warning' into 'master'	Evan Read	2019-03-12	1	-3/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "A lot of Trigger Token is Accessible from Internet because of the Documentation" Closes #52261 See merge request gitlab-org/gitlab-ce!25945
\| * \| \| \| \| \| \|	Resolve "A lot of Trigger Token is Accessible from Internet because of the ↵	Matija Čupić	2019-03-12	1	-3/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation"
* \| \| \| \| \| \|	Merge branch 'docs-settesttimeout-jest-fe' into 'master'	Evan Read	2019-03-12	1	-5/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update setTestTimeout documentation See merge request gitlab-org/gitlab-ce!25932
\| * \| \| \| \| \| \|	Update setTestTimeout documentation	Luke Bennett	2019-03-12	1	-5/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'patch-17' into 'master'	Evan Read	2019-03-12	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/ci/yaml: correct recursive expanded includes documentation See merge request gitlab-org/gitlab-ce!25918
\| * \| \| \| \| \| \|	doc/ci/yaml: correct recursive expanded includes documentation	Elan Ruusamäe	2019-03-12	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'patch-14' into 'master'	Evan Read	2019-03-11	1	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: ci/include: note about caching See merge request gitlab-org/gitlab-ce!22654
\| * \| \| \| \| \| \|	doc: ci/include: note about caching	Elan Ruusamäe	2019-03-11	1	-0/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'jc-upgrade-gitaly-1.27.0' into 'master'	Stan Hu	2019-03-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrading gitaly version to 1.27.0 See merge request gitlab-org/gitlab-ce!25986
\| * \| \| \| \| \| \|	Upgrading gitaly version to 1.27.0	John Cai	2019-03-11	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes bug in FindAllTags when using a commit sha as the tagname would cause an error
* \| \| \| \| \| \|	Merge branch 'mg-remove-node6-support' into 'master'	Clement Ho	2019-03-11	7	-26/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove node 6 config See merge request gitlab-org/gitlab-ce!25933