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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Internationalisation of notes directoryjs-i18n-notes	Brandon Labuschagne	2019-04-30	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 'get-rid-of-user-namespace-method' into 'master'	Dmitriy Zaporozhets	2019-04-25	3	-16/+2
\|\ \| \| \| \| \| \| \| \|	Get rid of the user_namespace API helper method See merge request gitlab-org/gitlab-ce!27636
\| *	Get rid of the user_namespace API helper method	Rémy Coutable	2019-04-24	3	-16/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'kp-add-base-url-support-graphql' into 'master'	Phil Hughes	2019-04-25	1	-3/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add support for baseUrl in ApolloClient instance within GraphQL helper See merge request gitlab-org/gitlab-ce!27657
\| * \|	Add support for baseUrl in ApolloClient instance	Kushal Pandya	2019-04-25	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for providing baseUrl/rootUrl within `uri` while creating ApolloClient instance.
* \| \|	Merge branch '60552-period-dropdown' into 'master'	Phil Hughes	2019-04-25	3	-0/+47
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Autocomplete dropdown for usernames shows HTML if you attempt to search for a username that starts with a period" Closes #60552 See merge request gitlab-org/gitlab-ce!27533
\| * \| \|	Escape special characters in GFM auto complete highlighting	Jan Beckmann	2019-04-25	3	-0/+47
\|/ / / \| \| \| \| \| \| \| \| \|	Fixes #60552
* \| \|	Merge branch 'jc-update-list-last-commits' into 'master'	Lin Jen-Shin	2019-04-25	4	-2/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Client side changes for ListLastCommitsForTree response update See merge request gitlab-org/gitlab-ce!26880
\| * \| \|	Update list_last_commits_for_tree response path field to path_bytes	John Cai	2019-04-24	4	-2/+26
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the gitaly client to use path_bytes field instead of the deprecated path field in list_last_commits_for_tree_response. Also adds a test to guard against non-utf8 path data
* \| \|	Merge branch 'fj-53523-add-option-avoid-loading-wiki-page-content' into 'master'	Stan Hu	2019-04-25	14	-85/+188
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid loading Wiki Pages content when listed Closes #53523 See merge request gitlab-org/gitlab-ce!22801
\| * \| \|	Added list_pages method to avoid loading all wiki pages content	Francisco Javier López	2019-04-25	14	-85/+188
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* \| \|	Merge branch '60687-enviro-dropdown' into 'master'	Fatih Acet	2019-04-24	4	-2/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
\| * \| \|	Fix Metrics environments dropdown60687-enviro-dropdown	Simon Knox	2019-04-24	4	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also bring back EE dashboard component
* \| \| \|	Merge branch 'fix-api-ide-relative-url-root' into 'master'	Fatih Acet	2019-04-24	5	-11/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
\| * \| \| \|	Fix API and IDE path with `/` relative_url_root	Paul Slaughter	2019-04-24	5	-11/+27
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* \| \| \|	Merge branch 'autodevops_remote_private_helm_repository' into 'master'	Stan Hu	2019-04-24	3	-1/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding ability to specify helm chart repo using environment variables Closes #49520 See merge request gitlab-org/gitlab-ce!27123
\| * \| \| \|	Added changelog	Stuart Moore	2019-04-08	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Adding ability to specify helm chart repo using environment variables	Stuart Moore	2019-04-08	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/49520 (Covers helm charts; does not cover docker repos)
* \| \| \| \|	Merge branch '60387-use-icons-in-user-popovers' into 'master'	Tim Zallmann	2019-04-24	4	-4/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
\| * \| \| \| \|	Add changelog entry60387-use-icons-in-user-popovers	Kushal Pandya	2019-04-22	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Show category icons in user popover	Kushal Pandya	2019-04-22	3	-4/+39
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Show bio, organization and location icons within user popover.
* \| \| \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Douglas Barbosa Alexandre	2019-04-24	2	-6/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put some flaky specs in quarantine See merge request gitlab-org/gitlab-ce!27633
\| * \| \| \| \|	Put some flaky specs in quarantine	Rémy Coutable	2019-04-24	2	-6/+3
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'i18n-extract-app/views/projects-forks' into 'master'	Clement Ho	2019-04-24	4	-25/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n: externalize strings from 'app/views/projects/forks' See merge request gitlab-org/gitlab-ce!27497
\| * \| \| \| \|	[CE] i18n: externalize strings from 'app/views/projects/forks'i18n-extract-app/views/projects-forks	Tao Wang	2019-04-23	4	-25/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'update-workhorse-master' into 'master'	Douglas Barbosa Alexandre	2019-04-24	2	-1/+6
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Workhorse to v8.7.0 See merge request gitlab-org/gitlab-ce!27630
\| * \| \| \| \|	Update Workhorse to v8.7.0	Nick Thomas	2019-04-24	2	-1/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-issue_10439' into 'master'	Nick Thomas	2019-04-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE cache update See merge request gitlab-org/gitlab-ce!27626
\| * \| \| \| \| \|	Backport EE cache update	Felipe Artur	2019-04-24	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵	Stan Hu	2019-04-24	3	-1/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416
\| * \| \| \| \| \|	Add CHANGELOG entry54656-500-error-on-save-of-general-pipeline-settings-timeout	Matija Čupić	2019-04-24	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Redirect to settings page on invalid update	Matija Čupić	2019-04-24	2	-1/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fj-60827-fix-web-strategy-error' into 'master'	Stan Hu	2019-04-24	3	-4/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug when project export to remote url fails Closes #60827 See merge request gitlab-org/gitlab-ce!27614
\| * \| \| \| \| \| \|	Fix bug when project export to remote url fails	Francisco Javier López	2019-04-24	3	-4/+18
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'add-ci-variable-protected-ref' into 'master'	Grzegorz Bizon	2019-04-24	6	-3/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
\| * \| \| \| \| \| \|	Make sure that CI_COMMIT_REF_PROTECTED is a bool	Jason van den Hurk	2019-04-18	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTED	Jason van den Hurk	2019-04-10	6	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change release version of CI_REF_PROTECTED to 11.11	Jason van den Hurk	2019-04-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog entry	Jason van den Hurk	2019-04-10	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added documentation for CI_REF_PROTECTED ci variable	Jason van den Hurk	2019-04-10	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added the CI_REF_PROTECTED variable to the Gitlab runner	Jason van den Hurk	2019-04-10	4	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This variable shows if the branch the runner is executing is protected or not. References: #50909
* \| \| \| \| \| \| \|	Merge branch '60475-add-ce-ee-vue-template-danger-check' into 'master'	Rémy Coutable	2019-04-24	2	-0/+58
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add rule to Danger to detect possible CE/EE Vue <template> issues" Closes #60475 See merge request gitlab-org/gitlab-ce!27328
\| * \| \| \| \| \| \| \|	Add Danger rule for EE/CE templates	Nathan Friend	2019-04-24	2	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds a rule to Danger that warns the developer when their MR includes changes to a CE .vue file that has a counterpart in the EE repo or vice-versa.
* \| \| \| \| \| \| \| \|	Merge branch '60540-merge-request-popover-is-not-working-on-the-to-do-page' ↵	Phil Hughes	2019-04-24	5	-10/+53
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge Request Popover is not working on the To Do page" Closes #60540 See merge request gitlab-org/gitlab-ce!27382
\| * \| \| \| \| \| \| \| \|	Resolve "Merge Request Popover is not working on the To Do page"	Sam Bigelow	2019-04-24	5	-10/+53
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '10099-ee-differences-for-ready-to-merge' into 'master'	Phil Hughes	2019-04-24	2	-9/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move EE differences for `ready_to_merge.vue` See merge request gitlab-org/gitlab-ce!27587
\| * \| \| \| \| \| \| \| \|	Move EE differences for `ready_to_merge.vue`	Natalia Tepluhina	2019-04-24	2	-9/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'sh-disable-internal-ids-available-check' into 'master'	Sean McGivern	2019-04-24	3	-3/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use internal ID tables in development and production Closes #60718 See merge request gitlab-org/gitlab-ce!27544
\| * \| \| \| \| \| \| \| \|	Always use internal ID tables in development and productionsh-disable-internal-ids-available-check	Stan Hu	2019-04-22	3	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid quiet failures that cause consistency errors in the database, we should now assume that the internal_ids table is available since we've had this table for close to a year. For tests that have migrations, we make this check thread-safe via SafeRequestStore. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60718
* \| \| \| \| \| \| \| \| \|	Merge branch 'pedroms-master-patch-06843' into 'master'	Achilleas Pipinellis	2019-04-24	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify UX debt label See merge request gitlab-org/gitlab-ce!27548