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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove the `comment_personal_snippet` permissionremove-comment-personal-snippet-permission	Sean McGivern	2019-05-02	5	-37/+44
\| \| \| \| \| \| \| \| \|	This is now entirely handled by `create_note`: 1. Project snippets prevent `create_note`. 2. Uploads already only support routing for personal snippets. This simplifies some policies and access checks, too!
*	Merge branch 'jprovazn-graphql-opentracing' into 'master'	Bob Van Landuyt	2019-05-02	6	-40/+90
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Opentracing (Jaeger) Closes #48726 See merge request gitlab-org/gitlab-ce!26981
\| *	Add opentracing integration for graphql	Jan Provaznik	2019-05-02	6	-40/+90
\|/ \| \| \| \| \| \|	Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
*	Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'	James Lopez	2019-05-02	6	-5/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow a member to have an access level equal to parent group Closes gitlab-ee#11323 See merge request gitlab-org/gitlab-ce!27913
\| *	Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membership	Stan Hu	2019-04-30	6	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppose you have this configuration: 1. Subgroup `hello/world` 2. Subgroup `hello/mergers`. 3. Project `hello/world/my-project` has invited group `hello/world` to access protected branches. 4. The rule allows the group to merge but no one can push. 5. User `newuser` has Owner access to the parent group `hello`. Previously, there was no way for the user `newuser` to be added to the `hello/mergers` group since the validation only allowed a user to be added at a higher access level. Since membership in a subgroup confers certain access rights, such as being able to merge or push code to protected branches, we have to loosen the validation and allow someone to be added at an equal level granted by the parent group. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
* \|	Merge branch 'patch-52' into 'master'	Evan Read	2019-05-02	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removes a typo in labels.md (Line 45) See merge request gitlab-org/gitlab-ce!27953
\| * \|	Removes a typo in labels.md (Line 45)	NoaHJ	2019-05-01	1	-1/+1
\| \| \|
* \| \|	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
\| \| \| \| \| \| \|