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

	Commit message (Collapse)	Author	Age	Files	Lines
*	I18N JS files starting with mjs-i18n-m	Brandon Labuschagne	2019-05-03	6	-13/+33
\| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
*	Merge branch 'js-i18n-diff-notes' into 'master'	Phil Hughes	2019-05-02	7	-14/+50
\|\ \| \| \| \| \| \| \| \|	Internationalisation of diff_note directory See merge request gitlab-org/gitlab-ce!27677
\| *	Internationalisation of diff_note directory	Brandon Labuschagne	2019-05-02	7	-14/+50
\|/ \| \| \| \| \| \| \|	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-pages' into 'master'	Filipa Lacerda	2019-05-02	6	-22/+81
\|\ \| \| \| \| \| \| \| \|	Internationalisation of pages directory See merge request gitlab-org/gitlab-ce!27731
\| *	Internationalisation of pages directory	Brandon Labuschagne	2019-05-02	6	-22/+81
\|/ \| \| \| \| \| \| \|	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 'fix-ide-relative-url-bug' into 'master'	Phil Hughes	2019-05-02	3	-7/+24
\|\ \| \| \| \| \| \| \| \|	Fix IDE get file data with '/' as relative root See merge request gitlab-org/gitlab-ce!27911
\| *	Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bug	Paul Slaughter	2019-04-30	3	-7/+24
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* \|	Merge branch 'tc-improve-db-process' into 'master'	Andreas Brandl	2019-05-02	1	-3/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Escape the usernames to avoid mentions See merge request gitlab-org/gitlab-ce!28004
\| * \|	Escape the usernames to avoid mentions	Toon Claes	2019-05-02	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid people and groups getting mentioned unintentionally by surrounding the names with backticks.
* \| \|	Merge branch 'js-i18n-merge-conflict' into 'master'	Fatih Acet	2019-05-02	3	-8/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of merge_conflicts directory See merge request gitlab-org/gitlab-ce!27720
\| * \| \|	Internationalisation of merge_conflicts directory	Brandon Labuschagne	2019-05-02	3	-8/+37
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-t-directories' into 'master'	Fatih Acet	2019-05-02	3	-2/+11
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Internationalisation of javascript/t* directories See merge request gitlab-org/gitlab-ce!27748
\| * \|	Internationalisation of javascript/t* directories	Brandon Labuschagne	2019-05-02	3	-2/+11
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	Filipa Lacerda	2019-05-02	14	-62/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`" Closes #59898 See merge request gitlab-org/gitlab-ce!27647
\| * \|	Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss	Scott Hampton	2019-04-25	14	-62/+27
\| \| \| \| \| \| \| \| \| \| \| \|	Updating class names, and using existing utility classes.
* \| \|	Merge branch 'masked-variables-docs-update' into 'master'	Filipa Lacerda	2019-05-02	2	-4/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify masked variable message, add docs link See merge request gitlab-org/gitlab-ce!27156
\| * \| \|	Clarify masked variable message, add link to docsmasked-variables-docs-update	mfluharty	2019-04-18	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update error message "This variable will not be masked" to "Cannot use Masked Variable with current value" Add link to masked variables section to error message
* \| \| \|	Merge branch ↵	Douwe Maan	2019-05-02	8	-16/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master' Disable retrying cancelled jobs Closes #53064 See merge request gitlab-org/gitlab-ce!27503
\| * \| \| \|	Apply suggestion to doc/ci/pipelines.md53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs	Miranda Fluharty	2019-05-01	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	Update documentation to explain job retryability	mfluharty	2019-04-23	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Update specs that use retryable canceled jobs	mfluharty	2019-04-19	5	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specs that test canceled jobs now - expect them not to be retryable or playable - expect them not to show retry buttons Specs that test retryability now - use failed status instead of canceled status
\| * \| \| \|	Make canceled jobs not retryable	mfluharty	2019-04-18	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See which tests break
* \| \| \| \|	Merge branch 'patch-52' into 'master'	Marcia Ramos	2019-05-02	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo See merge request gitlab-org/gitlab-ce!27907
\| * \| \| \| \|	fix typo	Morris-Chen	2019-04-30	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	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