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

	Commit message (Collapse)	Author	Age	Files	Lines
*	EE Backport to CE of EE!11151ee-9971-move-ee-specific-differences-to-ee-directory	Sam Bigelow	2019-04-26	2	-38/+93
\| \| \| \|	This moves all EE Specific lines into the ee directory
*	Merge branch 'winh-move-static-fixtures' into 'master'	Clement Ho	2019-04-26	8	-9/+9
\|\ \| \| \| \| \| \| \| \|	Move all static fixtures to static directory See merge request gitlab-org/gitlab-ce!27668
\| *	Move all static fixtures to static directory	Winnie Hellmann	2019-04-25	8	-9/+9
\| \|
* \|	Merge branch '7182-add-dast-full-scan-enabled-support-ce' into 'master'	Achilleas Pipinellis	2019-04-26	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add ZAP Full Scan support to DAST vendored template See merge request gitlab-org/gitlab-ce!27513
\| * \|	Add ZAP Full Scan support to DAST vendored template	Victor Zagorodny	2019-04-26	1	-1/+3
\|/ /
* \|	Merge branch '#57351-add-dotnet-core-yaml-template' into 'master'	Grzegorz Bizon	2019-04-26	2	-0/+112
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #57351 - Add .NET Core YAML template Closes #57351 See merge request gitlab-org/gitlab-ce!25604
\| * \|	Add changelog for MR !25604	Piotr Wosiek	2019-04-26	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Add changelog for adding .NET Core YAML template
\| * \|	Update .NET Core YAML template	Piotr Wosiek	2019-04-26	1	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Improve indent for cache paths
\| * \|	Update .NET Core YAML template - improve indent	Piotr Wosiek	2019-04-25	1	-47/+38
\| \| \| \| \| \| \| \| \| \| \| \|	Improve indent and remove empty lines
\| * \|	Update .NET Core YAML template - improve caching	Piotr Wosiek	2019-03-22	1	-27/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Revise logic of dependency caching, add cache key, make before script global.
\| * \|	Update .NET Core YAML template - add cache	Piotr Wosiek	2019-03-20	1	-22/+77
\| \| \| \| \| \| \| \| \| \| \| \|	Update the template showing how to cache restored dependencies, add few variables, reduce before_script part, add and improve descriptions.
\| * \|	Make the testing section more generic	Piotr Wosiek	2019-03-13	1	-6/+8
\| \| \|
\| * \|	Remove the diagram of project directories structure	Piotr Wosiek	2019-03-13	1	-10/+0
\| \| \|
\| * \|	Improve note about building not .NET Core based projects	Piotr Wosiek	2019-03-13	1	-5/+5
\| \| \|
\| * \|	Add .NET Core YAML template	Piotr Wosiek	2019-02-27	1	-0/+75
\| \| \|
* \| \|	Merge branch 'docs-fix-ref-links-ci-variables' into 'master'	Achilleas Pipinellis	2019-04-26	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reference-style links in CI predefined vars See merge request gitlab-org/gitlab-ce!27584
\| * \| \|	Fix reference-style links in CI predefined vars	Peter Leitzen	2019-04-26	1	-0/+4
\|/ / /
* \| \|	Merge branch 'qa-nightly-97-quarantin-add-file-template-spec' into 'master'	Sanad Liaquat	2019-04-26	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky tests See merge request gitlab-org/gitlab-ce!27732
\| * \| \|	Quaraintine flaky tests	Sanad Liaquat	2019-04-26	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch '57171-operations-controller-spec-refactor' into 'master'	Grzegorz Bizon	2019-04-26	1	-106/+110
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor operations controller spec Closes #57171 See merge request gitlab-org/gitlab-ce!27558
\| * \| \|	Fix a bug in shared_examples definition57171-operations-controller-spec-refactor	rpereira2	2019-04-25	1	-1/+1
\| \| \| \|
\| * \| \|	Move shared context to top of spec file	rpereira2	2019-04-24	1	-60/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Rename the shared_context - Use expect in stub_operations_update_service_returning.
\| * \| \|	Refactor operations controller spec	rpereira2	2019-04-22	1	-105/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move specs into a shared_context so that they can be reused. - Move common specs out of a more specific context.
* \| \| \|	Merge branch 'winh-stylelint-valid-json' into 'master'	Phil Hughes	2019-04-26	1	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make stylelint config a valid JSON file See merge request gitlab-org/gitlab-ce!27721
\| * \| \| \|	Make stylelint config a valid JSON file	Winnie Hellmann	2019-04-26	1	-4/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'revert-55767af4' into 'master'	Filipa Lacerda	2019-04-26	3	-15/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'" See merge request gitlab-org/gitlab-ce!27727
\| * \| \| \|	Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into ↵	Phil Hughes	2019-04-26	3	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !27589
* \| \| \| \|	Merge branch 'use-constant-for-helm-runner-check' into 'master'	Grzegorz Bizon	2019-04-26	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use constants for asserstion for helm chart test See merge request gitlab-org/gitlab-ce!27629
\| * \| \| \|	Use constants for assertion for helm chart test	Steve Azzopardi	2019-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are duplicating the value from the constant `Clusters::Applications::Runner::VERSION` inside of the tests which results into developers having to update the tests as well when they want to upgrade the Helm chart used for GitLab Runner
* \| \| \| \|	Merge branch 'improve-review-apps-scheduled-cleanup' into 'master'	Lin Jen-Shin	2019-04-26	1	-3/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Review Apps scheduled cleanup See merge request gitlab-org/gitlab-ce!27689
\| * \| \| \| \|	Improve Review Apps scheduled cleanup	Rémy Coutable	2019-04-26	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By moving it to the `build` stage and adding `action: stop` to it. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '60874-fix-suggestion-misalignment' into 'master'	Filipa Lacerda	2019-04-26	2	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Misalignment on suggested changes diff table" Closes #60874 See merge request gitlab-org/gitlab-ce!27612
\| * \| \| \| \| \|	Resolve "Misalignment on suggested changes diff table"	Natalia Tepluhina	2019-04-26	2	-2/+7
\|/ / / / / /
* \| \| \| \| \|	Merge branch '46048-canary-next' into 'master'	Phil Hughes	2019-04-26	6	-22/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds information about Canary environment Closes #46048 See merge request gitlab-org/gitlab-ce!27499
\| * \| \| \| \| \|	Adds information about Canary env46048-canary-next	Filipa Lacerda	2019-04-25	6	-22/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds a badge to the navbar that indicates if Canary is being used When canary is not being used, it renders a link to next.gitlab.com
* \| \| \| \| \| \|	Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'	Filipa Lacerda	2019-04-26	3	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "MR Popover is not attached in system notes" Closes #60855 See merge request gitlab-org/gitlab-ce!27589
\| * \| \| \| \| \| \|	Init MR Popovers onmount of system note60855-mr-popover-is-not-attached-in-system-notes	Sam Bigelow	2019-04-24	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing a bug where system notes had no MR Popovers
* \| \| \| \| \| \| \|	Merge branch '60808-only-show-target-branch-advanced-error-before-merge' ↵	Filipa Lacerda	2019-04-26	3	-1/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show the "target branch advanced" error message after merge Closes #60808 See merge request gitlab-org/gitlab-ce!27588
\| * \| \| \| \| \| \| \|	Only show message when MR is open60808-only-show-target-branch-advanced-error-before-merge	Nathan Friend	2019-04-24	3	-1/+24
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes the bug that was causing the "target branch has "advanced" error message to display after an MR was closed.
* \| \| \| \| \| \| \|	Merge branch 'patch-58' into 'master'	Phil Hughes	2019-04-26	1	-12/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in activity calendar See merge request gitlab-org/gitlab-ce!27685
\| * \| \| \| \| \| \| \|	Externalize strings in activity calendar	Victor Wu	2019-04-26	1	-12/+12
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '60639-cluster-application-state-machine' into 'master'	Phil Hughes	2019-04-26	11	-227/+480
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify cluster applications state management Closes #60639 See merge request gitlab-org/gitlab-ce!27461
\| * \| \| \| \| \| \| \|	Use a FSM to determine application next state	Enrique Alcántara	2019-04-26	11	-227/+480
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Separate cluster application UI state from server-side app status - Use a state machine to determine cluster application next state - Instead of using two variables to keep track of when an app is installing or updating, just use the app status property and control server-side and user events using the FSM service.
* \| \| \| \| \| \| \|	Merge branch 'ce-fl-fix-missing-required-prop' into 'master'	Phil Hughes	2019-04-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Adds missing prop See merge request gitlab-org/gitlab-ce!27671
\| * \| \| \| \| \| \| \|	Adds missing prop	Filipa Lacerda	2019-04-25	1	-0/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'osw-separate-ee-side-of-protected-branch' into 'master'	Sean McGivern	2019-04-26	4	-27/+60
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Port] Extract EE specific tests for protected branches/tags See merge request gitlab-org/gitlab-ce!27640
\| * \| \| \| \| \| \| \|	Extract EE specific tests for protected branches/tags	Oswaldo Ferreira	2019-04-25	4	-27/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have the spec files containing EE specific code for spec/features/protected_branches_spec.rb and spec/features/protected_tags_spec.rb. This commit deletes / extracts the CE part of it.
* \| \| \| \| \| \| \| \|	Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'	Kushal Pandya	2019-04-26	8	-251/+201
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrated issue spec files to Jest Closes #58827 See merge request gitlab-org/gitlab-ce!27673
\| * \| \| \| \| \| \| \| \|	refactor(issue): Refactored issue tests from Karma to Jest	Martin Hobert	2019-04-25	8	-251/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re #58827 Added changelog Added sync false, and removed unneeded destroyers
* \| \| \| \| \| \| \| \| \|	Merge branch 'migrate-import-projects-spec' into 'master'	Kushal Pandya	2019-04-26	8	-242/+256
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move import projects karma specs to jest Closes #60204 See merge request gitlab-org/gitlab-ce!27552