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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '64161-gitlab-fqdn' into 'master'	Grzegorz Bizon	2019-07-11	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add CI variable to provide GitLab FQDN Closes #64161 See merge request gitlab-org/gitlab-ce!30417
\| *	Add CI variable to provide GitLab FQDN	Balasankar "Balu" C	2019-07-10	1	-0/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \|	Merge branch 'registry-fix-multi-delete-modal' into 'master'	Kushal Pandya	2019-07-11	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Set unique modal IDs See merge request gitlab-org/gitlab-ce!30532
\| * \|	Set unique modal IDsregistry-fix-multi-delete-modal	Paul Gascou-Vaillancourt	2019-07-09	2	-2/+2
\| \| \|
* \| \|	Merge branch 'fix-issue-trackers-spec' into 'master'	Thong Kuah	2019-07-11	7	-12/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure all specs run properly See merge request gitlab-org/gitlab-ce!30367
\| * \| \|	Make sure all specs run properly	Jarka Košanová	2019-07-11	7	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- handling properties needs to be skipped when creating test records in order to test the legacy data
* \| \| \|	Give Knative serving permissions to service account	Hordur Freyr Yngvason	2019-07-11	6	-1/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab uses a kubernetes service account to perform deployments. For serverless deployments to work as expected with externally created clusters with their own knative installations (e.g. via Cloud Run), this account requires additional permissions in the serving.knative.dev API group.
* \| \| \|	Bring buttons style up to design spec	Scott Hampton	2019-07-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a CSS effort only. Fixes the padding of the buttons to be `8px 12px` (including border) so that the button height is 32px. Also adjusts the border width for all buttons when the state is `hover`, `focus`, or `active to be 2px thick instead of 1px thick. This is accomplished through an inset box-shadow as not to increase the size of the button. Fixes some colors for primary and tertiary buttons.
* \| \| \|	Merge branch 'better-merge-train-exlusive-lock-ce' into 'master'	Kamil Trzciński	2019-07-11	1	-0/+147
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Fix race condition on merge train with better exclusive lock See merge request gitlab-org/gitlab-ce!30352
\| * \| \| \|	Efficient merge train locksbetter-merge-train-exlusive-lock-ce	Shinya Maeda	2019-07-11	1	-0/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Efficient merge train locks with Sequential Process helper.
* \| \| \| \|	Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'	Douwe Maan	2019-07-11	7	-29/+145
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Banzai - avoid redis if attr is in DB cache See merge request gitlab-org/gitlab-ce!30334
\| * \| \| \| \|	Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cache	Mario de la Ossa	2019-07-10	7	-29/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.
* \| \| \| \| \|	Merge branch 'bvl-link-phab-users' into 'master'	James Lopez	2019-07-11	9	-16/+334
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch users from Phabricator + link to issues Closes #60565 See merge request gitlab-org/gitlab-ce!30321
\| * \| \| \| \|	Fetch users from Phabricator to link to issues	Bob Van Landuyt	2019-07-10	9	-16/+334
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We fetch the users from Phabricator based on their Phabricator ID. If a user with the same username exists and is a member of the project, we set them as assignee or author. When a user is applicable, we also cache it in Redis so we don't have to perform the request again for the same phid.
* \| \| \| \| \|	Merge branch '62088-search-back' into 'master'	Mike Greiling	2019-07-11	2	-0/+84
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed back navigation for projects filter Closes #62088 See merge request gitlab-org/gitlab-ce!30373
\| * \| \| \| \| \|	Fixed back navigation for projects filter62088-search-back	Denys Mishunov	2019-07-05	2	-0/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filterable list now sends request to filter the projects list explicitly with `json` extension to avoid breakage when navigating back from a project to the filtered project's list.
* \| \| \| \| \| \|	Merge branch 'sh-bump-rspec-versions' into 'master'	Mayra Cabrera	2019-07-10	4	-8/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade rspec-rails to 3.8.2 and dependencies See merge request gitlab-org/gitlab-ce!28378
\| * \| \| \| \| \| \|	Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versions	Douglas Barbosa Alexandre	2019-07-10	4	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings the rspec-core version in line with the Gitaly changes and introduces Rails 5.1/5.2 improvements. Full CHANGELOG: https://github.com/rspec/rspec-rails/blob/master/Changelog.md
* \| \| \| \| \| \| \|	Add support for additional panel types	Jose Ivan Vargas	2019-07-10	4	-6/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This introduces the single stat chart component aside from the area chart component
* \| \| \| \| \| \| \|	Merge branch 'fix_simple_format_undefined' into 'master'	Robert Speicher	2019-07-10	1	-1/+72
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `simple_format` undefined error #60179 Closes #60179 See merge request gitlab-org/gitlab-ce!30366
\| * \| \| \| \| \| \| \|	Fix undefined method `simple_format for MarkupHelper:Module	Vasiliy Yakliushin	2019-07-07	1	-1/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`simple_format` is not defined in ActionView::Helpers::TagHelper, but it is actually located in ActionView::Helpers::TextHelper. The solution is to include the correct helper. I've also added tests for `#markup_unsafe` because they were missing.
* \| \| \| \| \| \| \| \|	Add a rubocop for Rails.logger	Mayra Cabrera	2019-07-10	1	-0/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-07-10	1	-9/+56
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/improve-performance-environment-statuses-endpoint' into 'master' Improve performance of fetching environments statuses Closes #62589 See merge request gitlab-org/gitlab-ce!30560
\| * \| \| \| \| \| \| \| \|	Resolve Gitaly N+1 for CI/CD environments statuses	Grzegorz Bizon	2019-07-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add additional test case for Gitaly N+1 for diff files	Grzegorz Bizon	2019-07-10	1	-36/+65
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a test for `ci_environments_status` Gitaly N+1	Grzegorz Bizon	2019-07-10	1	-16/+34
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Remove deleteNote from notes service	Winnie Hellmann	2019-07-10	1	-11/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add routing spec for deploy_tokens controller	Dmitriy Zaporozhets	2019-07-10	1	-0/+6
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch '63044-cluster-health-group-refactor' into 'master'	Douglas Barbosa Alexandre	2019-07-10	2	-19/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
\| * \| \| \| \| \| \| \|	Remove unnecessary let in spec63044-cluster-health-group-refactor	Ryan Cobb	2019-07-09	1	-6/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename Gitlab::Importers module	Ryan Cobb	2019-07-09	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to avoid confusion between Gitlab::Importers module and other like named modules, this renamed it to Gitlab::DatabaseImporters.
\| * \| \| \| \| \| \| \|	Remove CommonMetricsImporter patch	Ryan Cobb	2019-07-09	2	-18/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CommonMetricsImporter patch and change all references to CommonMetrics::Importer. Move specs into their appropriate folders. Also cleans up some common_metric importer namespacing.
\| * \| \| \| \| \| \| \|	Move importers to lib folder	Ryan Cobb	2019-07-09	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves our metric importers into the lib folder. This will allow them to be autoloaded instead of having to explicitly require them.
\| * \| \| \| \| \| \| \|	Refactor common metrics importer	Ryan Cobb	2019-07-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This refactors common metrics importer for two reasons. 1. To create a new pattern that can be followed by future importers that will minimize dependency collision and 2. To allow EE to more easily extend dependencies.
* \| \| \| \| \| \| \| \|	Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'	Douglas Barbosa Alexandre	2019-07-10	10	-13/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
\| * \| \| \| \| \| \| \| \|	Add newline before subjectprepare-cycle-analytics-for-group-level	Małgorzata Ksionek	2019-07-10	6	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop offences
\| * \| \| \| \| \| \| \| \|	Add cr remarks	Małgorzata Ksionek	2019-07-09	9	-9/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add code review remarks	Małgorzata Ksionek	2019-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update events spec	Małgorzata Ksionek	2019-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move project level specs	Małgorzata Ksionek	2019-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update class calls	Małgorzata Ksionek	2019-07-09	7	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change constant path	Małgorzata Ksionek	2019-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fixed-dropdown-hover-styles' into 'master'	Annabel Dunstone Gray	2019-07-10	1	-2/+36
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown hover styles Closes #64330 and #64340 See merge request gitlab-org/gitlab-ce!30534
\| * \| \| \| \| \| \| \| \|	Fixed dropdown hover styles	Phil Hughes	2019-07-09	1	-2/+36
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64340
* \| \| \| \| \| \| \| \|	Workaround ESLint only resolving paths in test files	Winnie Hellmann	2019-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-07-10	1	-0/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboard' into 'master' Fix wrong URL when creating milestones from instance milestones dashboard Closes #64321 See merge request gitlab-org/gitlab-ce!30512
\| * \| \| \| \| \| \| \| \|	Fix invalid milestone URL for new milestone dropdown64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboard	Dmitriy Zaporozhets	2019-07-09	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Expose metrics element for FE consumption	Sarah Yasonik	2019-07-10	3	-0/+169
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds GFM Pipline filters to insert a placeholder in the generated HTML from GFM based on the presence of a metrics dashboard link. The front end should look for the class 'js-render-metrics' to determine if it should replace the element with metrics charts. The data element 'data-dashboard-url' should be the endpoint the front end should hit in order to obtain a dashboard layout in order to appropriately render the charts.
* \| \| \| \| \| \| \| \|	GraphQL support for Notes created in discussions62826-graphql-note-mutations	Luke Duncalfe	2019-07-10	5	-2/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A new `discussion_id` argument on the `createNote` mutation allows people to create a note within that discussion. The ability to lazy-load Discussions has been added, so GraphQL.object_from_id can treat Discussions the same as AR objects and batch load them. https://gitlab.com/gitlab-org/gitlab-ce/issues/62826 https://gitlab.com/gitlab-org/gitlab-ee/issues/9489
* \| \| \| \| \| \| \| \|	Expose diff_refs on MergeRequestType	Luke Duncalfe	2019-07-10	3	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/issues/9489