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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add missing linksdocs-fe-initiatives	Simon Knox	2018-11-30	1	-7/+4
\|
*	Merge branch 'master' into docs-fe-initiatives	Simon Knox	2018-11-30	3479	-29344/+134783
\|\
\| *	Merge branch 'gitlab-runner-services-dns-hosts' into 'master'	Evan Read	2018-11-28	1	-0/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	using_docker_images.md: document services inheriting dns and addn hosts settings See merge request gitlab-org/gitlab-ce!23333
\| \| *	using_docker_images.md: document services inheriting dns and addn hosts settings	Florian Klink	2018-11-28	1	-0/+3
\| \|/
\| *	Merge branch 'docs/add-note-about-terminal-not-being-available' into 'master'	Evan Read	2018-11-28	1	-5/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add notice for web temrinal on GitLab.com See merge request gitlab-org/gitlab-ce!23269
\| \| *	Add notice for web temrinal on GitLab.comdocs/add-note-about-terminal-not-being-available	Steve Azzopardi	2018-11-27	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have had multiple issues on why web terminals are not working on GitLab.com, there is current work in progress to make it stable and work in https://gitlab.com/gitlab-org/gitlab-ce/issues/52611
\| * \|	Merge branch '_acet-fix-flash-styling' into 'master'	Mike Greiling	2018-11-27	2	-5/+10
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always prefer flash-text as display block Closes #53920 See merge request gitlab-org/gitlab-ce!23382
\| \| * \|	Always prefer flash-text as display block	Fatih Acet	2018-11-27	2	-5/+10
\| \| \| \|
\| * \| \|	Merge branch 'leipert-update-d3' into 'master'	Mike Greiling	2018-11-27	2	-49/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update d3 to match the mermaid version See merge request gitlab-org/gitlab-ce!23383
\| \| * \| \|	Update d3	Lukas Eipert	2018-11-27	2	-49/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'lock-trace-writes' into 'master'	Stan Hu	2018-11-27	11	-58/+99
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lock writes to trace stream Closes #51502 See merge request gitlab-org/gitlab-ce!23332
\| \| * \| \| \|	Lock writes to trace stream	Kamil Trzciński	2018-11-27	11	-58/+99
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '53763-fix-encrypt-columns-data-loss' into 'master'	Stan Hu	2018-11-27	5	-2/+96
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly handle data-loss scenarios when encrypting columns Closes #53763 See merge request gitlab-org/gitlab-ce!23306
\| \| * \| \| \| \|	Correctly handle data-loss scenarios when encrypting columns	Nick Thomas	2018-11-27	5	-2/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the EncryptColumns background migration runs in a sidekiq with a stale view of the database schema, or when the purported destination columns don't actually exist, data loss can result. Attempt to work around these issues by reloading schema information before running the migration, and raising errors if the model reports that any of its source or destination columns are missing.
\| * \| \| \| \| \|	Merge branch '52276-jump-to-top-in-merge-request' into 'master'	Phil Hughes	2018-11-27	3	-0/+61
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Jump to top in merge request" Closes #52276 See merge request gitlab-org/gitlab-ce!23069
\| \| * \| \| \| \| \|	Resolve "Jump to top in merge request"	Sam Bigelow	2018-11-27	3	-0/+61
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'issuable-suggestions' into 'master'	Filipa Lacerda	2018-11-27	36	-1/+1185
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggest issues when typing title Closes #22071 See merge request gitlab-org/gitlab-ce!22866
\| \| * \| \| \| \| \|	Suggests issues when typing title	Phil Hughes	2018-11-27	36	-1/+1185
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This suggests possibly related issues when the user types a title. This uses GraphQL to allow the frontend to request the exact data that is requires. We also get free caching through the Vue Apollo plugin. With this we can include the ability to import .graphql files in JS and Vue files. Also we now have the Vue test utils library to make testing Vue components easier. Closes #22071
\| * \| \| \| \| \| \|	Merge branch 'dz-fix-new-project-error-message' into 'master'	Filipa Lacerda	2018-11-27	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix top padding for new project form when error message is present See merge request gitlab-org/gitlab-ce!23384
\| \| * \| \| \| \| \|	Fix top padding for new project form when error message is present	Dmitriy Zaporozhets	2018-11-27	1	-2/+2
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch '53874-overlap-separator-navbar' into 'master'	Phil Hughes	2018-11-27	4	-18/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix overlapping separator on the mobile navigation bar" Closes #53874 See merge request gitlab-org/gitlab-ce!23126
\| \| * \| \| \| \| \|	Resolve "Fix overlapping separator on the mobile navigation bar"	Thomas Pathier	2018-11-27	4	-18/+15
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'json-logging-for-k8s' into 'master'	Stan Hu	2018-11-27	8	-14/+130
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Json logging for k8s Integration See merge request gitlab-org/gitlab-ce!23328
\| \| * \| \| \| \| \|	Use JSON logging for helm install services	Dylan Griffith	2018-11-27	7	-9/+125
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Correct errors in doc/development/logging.md	Dylan Griffith	2018-11-23	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '53248-docs-update-integrate-your-server-with-github-docs' into ↵	Marcia Ramos	2018-11-27	4	-15/+19
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update GitHub integration docs to mainly follow GitHub updates. Closes #53248 See merge request gitlab-org/gitlab-ce!22643
\| \| * \| \| \| \| \| \|	Update GitHub integration docs to mainly follow GitHub updates.	Takuya Noguchi	2018-11-01	4	-15/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'docs/skip-auto-reconfigure' into 'master'	Marcia Ramos	2018-11-27	3	-4/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace deprecated skip-auto-migrations occurrence Closes #45031 See merge request gitlab-org/gitlab-ce!23326
\| \| * \| \| \| \| \| \| \|	Replace deprecated skip-auto-migrations occurrencedocs/skip-auto-reconfigure	Achilleas Pipinellis	2018-11-23	3	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs/pages-infra-issue' into 'master'	Marcia Ramos	2018-11-27	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to infra issue about Pages access control Closes #54269 See merge request gitlab-org/gitlab-ce!23352
\| \| * \| \| \| \| \| \| \|	Add link to infra issue about Pages access control	Achilleas Pipinellis	2018-11-26	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/update-mrs-troubleshooting-page-link' into 'master'	Douwe Maan	2018-11-27	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge requests troubleshooting docs link See merge request gitlab-org/gitlab-ce!23344
\| \| * \| \| \| \| \| \| \| \|	Update merge requests troubleshooting docs link	Grzegorz Bizon	2018-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'leipert-fix-unsecure-npm-deps' into 'master'	Mike Greiling	2018-11-27	2	-178/+110
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unsecure node dependencies See merge request gitlab-org/gitlab-ce!23378
\| \| * \| \| \| \| \| \| \| \| \|	Fix unsecure node dependencies	Lukas Eipert	2018-11-27	2	-178/+110
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'diff-header-styling-fixes' into 'master'	Filipa Lacerda	2018-11-27	6	-27/+38
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed UI bugs with sticky diff header Closes #54503 See merge request gitlab-org/gitlab-ce!23374
\| \| * \| \| \| \| \| \| \| \|	Fixed UI bugs with sticky diff header	Phil Hughes	2018-11-27	6	-27/+38
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-some-grammar' into 'master'	Achilleas Pipinellis	2018-11-27	14	-14/+14
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix minor grammar issues See merge request gitlab-org/gitlab-ce!23372
\| \| * \| \| \| \| \| \| \| \|	Fix minor grammar issues	Evan Read	2018-11-27	14	-14/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '51792-dont-delete-failed-install-pods' into 'master'	Dmitriy Zaporozhets	2018-11-27	5	-26/+47
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't remove failed install pods Closes #51792 See merge request gitlab-org/gitlab-ce!23350
\| \| * \| \| \| \| \| \| \| \| \|	Don't remove failed install pods	Dylan Griffith	2018-11-27	5	-26/+47
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to keep failed install pods around so that it is easier to debug why a failure occured. With this change we also need to ensure that we remove a previous pod with the same name before installing so that re-install does not fail. Another change here is that we no longer need to catch errors from delete_pod! in CheckInstallationProgressService as we now catch the ResourceNotFoundError in Helm::Api. The catch statement in CheckInstallationProgressService was also probably too broad before and should have been narrowed down simply to ResourceNotFoundError.
\| * \| \| \| \| \| \| \| \| \|	Merge branch '53778-remove-site-statistics' into 'master'	Sean McGivern	2018-11-27	10	-224/+27
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Site Statistic Closes #53778 See merge request gitlab-org/gitlab-ce!23314
\| \| * \| \| \| \| \| \| \| \|	Remove Site Statistic53778-remove-site-statistics	Gabriel Mazetto	2018-11-26	10	-224/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This approach caused many different problems as we tightened the query execution timeout.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'if-ce-54109-fix_user_by_any_email' into 'master'	Grzegorz Bizon	2018-11-27	3	-6/+37
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User#find_by_any_email to respect confirmed flag on secondary emails See merge request gitlab-org/gitlab-ce!23181
\| \| * \| \| \| \| \| \| \| \| \|	Update ce-54109-fix_user_by_any_email.ymlif-ce-54109-fix_user_by_any_email	Grzegorz Bizon	2018-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	User#find_by_any_email to respect confirmed flag on secondary emails	Imre Farkas	2018-11-26	3	-6/+37
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-parse-boolean' into 'master'	Phil Hughes	2018-11-27	31	-57/+106
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add parseBoolean helper function See merge request gitlab-org/gitlab-ce!23283
\| \| * \| \| \| \| \| \| \| \| \| \|	Replace `=== true` with `parseBoolean()`	Winnie Hellmann	2018-11-27	15	-18/+36
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Replace convertPermissionToBoolean with parseBoolean	Winnie Hellmann	2018-11-27	14	-38/+35
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add parseBoolean helper function	Winnie Hellmann	2018-11-27	2	-1/+35
\| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|