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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Final review feedback applieddocs/modify-versions-guidance	Evan Read	2019-05-02	1	-3/+3
\|
*	Adjust guidance based on feedback	Evan Read	2019-05-02	1	-2/+3
\|
*	Change the guidance for version text	Evan Read	2019-05-02	1	-23/+13
\|
*	Adjust how we do version text in docs	Evan Read	2019-05-02	1	-6/+23
\|
*	Merge branch 'da-sentry-client-side-settings' into 'master'	Stan Hu	2019-05-01	6	-3/+11
\|\ \| \| \| \| \| \| \| \|	Allow Sentry client-side DSN to be passed on gitlab.yml See merge request gitlab-org/gitlab-ce!27967
\| *	Add CHANGELOG entryda-sentry-client-side-settings	Douglas Barbosa Alexandre	2019-05-01	1	-0/+5
\| \|
\| *	Allow Sentry client-side DSN to be passed on gitlab.yml	Douglas Barbosa Alexandre	2019-05-01	5	-3/+6
\| \|
* \|	Merge branch 'doc-patch-example-domain' into 'master'	Evan Read	2019-05-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update GitHub integration instructions to swap example domain to *.example.com (github.md) See merge request gitlab-org/gitlab-ce!19352
\| * \|	Update GitHub integration instructions to swap example domain to ↵	Mike Lewis	2019-05-01	1	-1/+1
\|/ / \| \| \| \| \| \|	*.example.com (github.md)
* \|	Merge branch 'patch-51' into 'master'	Evan Read	2019-05-01	1	-2/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add example for the artifacts:paths section See merge request gitlab-org/gitlab-ce!27523
\| * \|	Add example for the artifacts:paths section	Blair Lunceford	2019-05-01	1	-2/+4
\|/ /
* \|	Merge branch 'securitytxt' into 'master'	John Northrup	2019-05-01	1	-0/+6
\|\ \ \| \|/ \|/\| \| \| \| \|	Add a security txt https://securitytxt.org/ See merge request gitlab-org/gitlab-ce!27961
\| *	Add a security txt https://securitytxt.org/	Sid Sijbrandij	2019-05-01	1	-0/+6
\| \|
* \|	Merge branch 'bertrand-lpl-master-patch-56649' into 'master'docs-subscription-changes-and-data	Mike Lewis	2019-05-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replace misinterpreted `\|` caracter in a table See merge request gitlab-org/gitlab-ce!25319
\| * \|	Replace misinterpreted `\|` caracter in a table	Bertrand Jamin	2019-02-17	1	-1/+1
\| \| \|
* \| \|	Merge branch 'js-i18n-notes' into 'master'	Clement Ho	2019-05-01	4	-8/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of notes directory See merge request gitlab-org/gitlab-ce!27726
\| * \| \|	Internationalisation of notes directory	Brandon Labuschagne	2019-05-01	4	-8/+31
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \|	Merge branch 'js-i18n-behaviors' into 'master'	Clement Ho	2019-05-01	5	-6/+29
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	i18n the behaviors directory See merge request gitlab-org/gitlab-ce!27637
\| * \|	Internationalisation of behaviors directory	Brandon Labuschagne	2019-05-01	5	-6/+29
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \|	Merge branch 'js-i18n-board' into 'master'	Clement Ho	2019-05-01	5	-5/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of boards directory See merge request gitlab-org/gitlab-ce!27672
\| * \|	Internationalisation of board directory	Brandon Labuschagne	2019-05-01	5	-5/+22
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \|	Merge branch 'js-i18n-filtered-search' into 'master'	Clement Ho	2019-05-01	9	-18/+41
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of filtered_search directory See merge request gitlab-org/gitlab-ce!27678
\| * \|	Internationalisation of filtered_search directory	Brandon Labuschagne	2019-05-01	9	-18/+41
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \|	Merge branch '9962-ee-diff-note-actions' into 'master'	Phil Hughes	2019-05-01	2	-9/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_actions.vue`" See merge request gitlab-org/gitlab-ce!27900
\| * \|	Resolve "Move EE differences for ↵	Natalia Tepluhina	2019-05-01	2	-9/+15
\|/ / \| \| \| \| \| \|	`app/assets/javascripts/notes/components/note_actions.vue`"
* \|	Merge branch '10694-propagate-env-vars-only-if-set-ce' into 'master'	Douwe Maan	2019-05-01	2	-18/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Propagate ENV vars to SAST and Dependency Scanning Docker containers only if they are set See merge request gitlab-org/gitlab-ce!27659
\| * \|	Propagate ENV vars to SAST and Dependency Scanning Docker containers only if ↵	Victor Zagorodny	2019-05-01	2	-18/+38
\|/ / \| \| \| \| \| \|	they are set
* \|	Merge branch 'fj-refactor-mirror-instructions-view' into 'master'	Sean McGivern	2019-05-01	2	-1/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor mirror instructions view See merge request gitlab-org/gitlab-ce!27901
\| * \|	Refactor mirror instructions view	Francisco Javier López	2019-05-01	2	-1/+5
\|/ /
* \|	Merge branch 'bvl-upload-designs-fix-ce' into 'master'	Douwe Maan	2019-05-01	2	-3/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Gitlab::GlRepository#types an instance method See merge request gitlab-org/gitlab-ce!27902
\| * \|	Make Gitlab::GlRepository#types an instance method	Bob Van Landuyt	2019-04-30	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Having this as an instance method makes it easier to override in the prepended `EE` module. If we try to override this method on the module itself, it would not be overridden correctly, depending on the load order.
* \| \|	Merge branch 'add-specs-for-group-routing-spec' into 'master'	Yorick Peterse	2019-05-01	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs to group routing spec See merge request gitlab-org/gitlab-ce!27705
\| * \| \|	Add specs to group routing specadd-specs-for-group-routing-spec	Małgorzata Ksionek	2019-04-26	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch '59974-multiple-dashboards-be' into 'master'	Sean McGivern	2019-05-01	20	-108/+563
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve BE for "Load dashboards from project's git repository" Closes #59974 See merge request gitlab-org/gitlab-ce!27608
\| * \| \| \|	Update metrics dashboard API to load yml from repo	Sarah Yasonik	2019-05-01	20	-108/+563
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* \| \| \|	Merge branch 'add-project-level-config-for-merge-train-ce' into 'master'	Sean McGivern	2019-05-01	3	-1/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Add project level config for merge train See merge request gitlab-org/gitlab-ce!27819
\| * \| \| \|	Add project level config for merge trainadd-project-level-config-for-merge-train-ce	Shinya Maeda	2019-04-30	3	-1/+19
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	We add the option and expose the parameter for frontend work
* \| \| \|	Merge branch '58294-discussion-notes-component' into 'master'	Phil Hughes	2019-05-01	9	-211/+418
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract discussion notes into new component Closes #58294 See merge request gitlab-org/gitlab-ce!27066
\| * \| \| \|	Extract discussion notes into new component	Paul Gascou-Vaillancourt	2019-05-01	9	-211/+418
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Moved discussion notes out of `NoteableDiscussion` component into a new `DiscussionNotes` component - Wrote Jest tests for the new `DiscussionNotes` component - Updated Jest config for emojis fixtures - Updated Karma tests `NoteableDiscussion` to match its new structure - Convert `DiffDiscussions` tests to use Vue test utils
* \| \| \|	Update CHANGELOG.md for 11.10.4	GitLab Release Tools Bot	2019-05-01	14	-66/+23
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'fix-webpack-assets-relative-url-bug' into 'master'	Phil Hughes	2019-05-01	2	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix webpack asset patch with '/' as relative root See merge request gitlab-org/gitlab-ce!27909
\| * \| \| \|	Fix webpack asset patch with '/' as relative root	Paul Slaughter	2019-04-30	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* \| \| \| \|	Merge branch 'js-i18n-raven' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-3	Phil Hughes	2019-05-01	2	-4/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of raven directory See merge request gitlab-org/gitlab-ce!27741
\| * \| \| \| \|	Internationalisation of raven directory	Brandon Labuschagne	2019-05-01	2	-4/+17
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \| \|	Merge branch 'winh-binary-fixture-path' into 'master'	Phil Hughes	2019-05-01	5	-5/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use FIXTURES_PATH constant for binary fixtures in frontend tests See merge request gitlab-org/gitlab-ce!27891
\| * \| \| \| \|	Use FIXTURES_PATH for loading test.pdf	Winnie Hellmann	2019-04-30	4	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Use FIXTURES_PATH in balsamiq_viewer_integration_spec.js	Winnie Hellmann	2019-04-30	2	-2/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-jest-ide' into 'master'	Phil Hughes	2019-05-01	2	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove babel environment for Jest Closes #59164 See merge request gitlab-org/gitlab-ce!27676
\| * \| \| \| \| \|	Remove babel environment for Jest	Winnie Hellmann	2019-04-25	2	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-repo-merge-9-analytics' into 'master'	Achilleas Pipinellis	2019-05-01	3	-1/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Merge EE doc/analytics to CE See merge request gitlab-org/gitlab-ce!27699