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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bug	Paul Slaughter	2019-04-30	1	-3/+4
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
*	Merge branch 'fix-environment-on-stop-not-work' into 'master'	Sean McGivern	2019-04-30	5	-5/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	`on_stop` is not automatically triggered with pipelines for merge requests Closes #60885 See merge request gitlab-org/gitlab-ce!27618
\| *	Fix environment automatic on_stop trigger	Shinya Maeda	2019-04-30	5	-5/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to the nature of pipelines for merge requests, deployments.ref can be a merge request ref instead of a branch name. We support the environment auto-stop hook for this case
* \|	Merge branch 'bw-add-graphql-groups' into 'master'	Grzegorz Bizon	2019-04-30	7	-3/+75
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add basic GraphQL for a Group Closes #60786 See merge request gitlab-org/gitlab-ce!27492
\| *	Refactor group query spec	Brett Walker	2019-04-23	1	-4/+4
\| \| \| \| \| \| \| \|	and removing unnecessary code
\| *	Basic GraphQL for a group	Brett Walker	2019-04-23	7	-3/+75
\| \| \| \| \| \| \| \| \| \|	Add new query for Groups, with new GroupType and NamespaceType
* \|	Merge branch 'pl-fix-k8s-ns-query-variables' into 'master'	Grzegorz Bizon	2019-04-30	2	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use correct k8s namespace in Prometheus queries See merge request gitlab-org/gitlab-ce!27812
\| * \|	Also define KubernetesService#namespace_for	Peter Leitzen	2019-04-29	1	-0/+4
\| \| \|
\| * \|	Remove superfluous navigator operator	Peter Leitzen	2019-04-29	1	-1/+1
\| \| \|
\| * \|	Use correct k8s namespace in Prometheus queries	Peter Leitzen	2019-04-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit the wrong namespace could have been used in Prometheus queries for group-level installations.
* \| \|	Remove disabled pages domains	Vladimir Shushlin	2019-04-30	3	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Domain will be removed by verification worker after 1 week of being disabled
* \| \|	Refactored LfsImportService and ImportService	Francisco Javier López	2019-04-30	5	-94/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to make `LfsImportService` more reusable, we need to extract the logic inside `ImportService` and encapsulate it into the service.
* \| \|	Merge branch 'sh-disable-batch-load-replace-methods' into 'master'	Sean McGivern	2019-04-30	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable method replacement in avatar loading Closes #60903 See merge request gitlab-org/gitlab-ce!27866
\| * \| \|	Disable method replacement in avatar loading	Stan Hu	2019-04-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We've seen a significant performance penalty when using `BatchLoader#__replace_with!`. This defines methods on the batch loader that proxy to the 'real' object using send. The alternative is `method_missing`, which is slower. However, we've noticed that `method_missing` can be faster if: 1. The objects being loaded have a large interface. 2. We don't call too many methods on the loaded object. Avatar uploads meet both criteria above, so let's use the newly-released feature in https://github.com/exAspArk/batch-loader/pull/45. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60903
* \| \| \|	Remove unncessary `to_time` in cluster services	Dylan Griffith	2019-04-29	2	-2/+2
\| \| \| \|
* \| \| \|	Internationalize errors CheckUninstallProgressService	Dylan Griffith	2019-04-29	1	-4/+4
\| \| \| \|
* \| \| \|	Rename #timeouted -> #timed_out	Dylan Griffith	2019-04-29	2	-4/+4
\| \| \| \|
* \| \| \|	Use #public_send instead #method.call	Dylan Griffith	2019-04-29	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These builder methods are using user provided input inside a public_send but this is safe to do in this instance because before they are called we check before calling them that they match an expected application name.
* \| \| \|	In Prometheus use update! instead of update	Dylan Griffith	2019-04-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to not miss any errors since we are not checking the return value of update
* \| \| \|	CheckUninstallProgressService remove unnecessary begin	Dylan Griffith	2019-04-29	1	-3/+1
\| \| \| \|
* \| \| \|	Deactivate any prometheus_service upon destroy	Thong Kuah	2019-04-29	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basically does the reverse of after_transition to :installed.
* \| \| \|	DELETE clusters/:id/:application endpoint	Thong Kuah	2019-04-29	4	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoint to delete/uninstall a cluster application
* \| \| \|	Teach Prometheus about #uninstall_command	Thong Kuah	2019-04-29	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs
* \| \| \|	Expose can_uninstall in cluster_status.json	Thong Kuah	2019-04-29	8	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only prometheus can be uninstalled atm, the rest will be dealt with later. Presumption is that new application types will have uninstallation implmemented at the same time.
* \| \| \|	Destroy app on successful uninstallation	Thong Kuah	2019-04-29	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rescue and put into :uninstall_errored if something goes wrong while destroying, which can happen. I think it is safe to expose the full error message from the destroy error. Remove the :uninstalled state as no longer used.
* \| \| \|	Services to uninstall cluster application	Thong Kuah	2019-04-29	4	-0/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ to monitor progress of uninstallation pod
* \| \| \|	Define state transitions for uninstalling apps	Thong Kuah	2019-04-29	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added :uninstalled state as wasn't sure if we should be destroying the cluster apps
* \| \| \|	Fix ref_text of merge request pipelinesfix-ref-text-of-mr-pipelines	Shinya Maeda	2019-04-30	2	-10/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Source branch can be removed after the merge and we have to make sure to avoid rendering links if it's the case.
* \| \| \|	Merge branch ↵	Ash McKenzie	2019-04-30	2	-37/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
\| * \| \|	Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian	Fatih Acet	2019-04-15	2	-37/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
* \| \| \|	Merge branch 'fix-boards-card-dragging-styling' into 'master'	Annabel Dunstone Gray	2019-04-29	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed boards card dragging styling Closes #61050 See merge request gitlab-org/gitlab-ce!27802
\| * \| \| \|	Fixed boards card dragging styling	Phil Hughes	2019-04-29	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61050
* \| \| \| \|	Merge branch '61036-fix-ingress-base-domain-text' into 'master'	Tim Zallmann	2019-04-29	1	-8/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix base domain help text update Closes #61036 See merge request gitlab-org/gitlab-ce!27746
\| * \| \| \| \|	Fix base domain help text update	Enrique Alcantara	2019-04-26	1	-8/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Internationalisation of javascript/m* directories	Brandon Labuschagne	2019-04-29	3	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \|	Internationalisation of vue_shared directory	Brandon Labuschagne	2019-04-29	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets the Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \| \| \|	Merge branch '59265-project-is-being-serialized-when-enqueueing-to-sidekiq' ↵	Rémy Coutable	2019-04-29	1	-7/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Project is being serialized when enqueueing to sidekiq" Closes #59265 See merge request gitlab-org/gitlab-ce!27825
\| * \| \| \| \| \|	Stop serialising project when removing todos	Sean McGivern	2019-04-29	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Todos::Destroy::EntityLeaveService#project_ids` was returning ActiveRecord objects with IDs, not simply IDs. That means we were serialising more than we needed to in Sidekiq. We can simply rename this method to `#projects` as this class doesn't use any of the superclass methods that would use `#project_ids`.
* \| \| \| \| \| \|	Merge branch 'lock-pipeline-schedule-worker' into 'master'	Stan Hu	2019-04-29	1	-11/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent concurrent execution of PipelineScheduleWorker Closes gitlab-com/gl-infra/production#805 See merge request gitlab-org/gitlab-ce!27781
\| * \| \| \| \| \| \|	Prevent concurrent execution of PipelineScheduleWorker	Shinya Maeda	2019-04-28	1	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, PipelineScheduleWorker is fired in a short period on our production server. We can stop this behavior by locking the execution thread with in_lock method.
* \| \| \| \| \| \| \|	Merge branch 'fix-ci-commit-ref-name-and-slug' into 'master'	Sean McGivern	2019-04-29	6	-8/+42
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `CI_COMMIT_REF_NAME` and `SLUG` variable idempotent Closes #60822 See merge request gitlab-org/gitlab-ce!27663
\| * \| \| \| \| \| \| \|	Fix CI_COMMIT_REF_NAME and SLUG variable	Shinya Maeda	2019-04-29	6	-8/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With Pipelines for Merge Requests feature, users cannout keep using $CI_COMMIT_REF_NAME and _SLUG predefined variables for dynamic environments. We fix this problem by explicitly looking at the source ref.
* \| \| \| \| \| \| \| \|	Internationalisation of cycle_analytics directory	Brandon Labuschagne	2019-04-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '55948-help-text-formatting-wiki' into 'master'	Annabel Dunstone Gray	2019-04-29	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Format extra help page text like wiki Closes #55948 See merge request gitlab-org/gitlab-ce!26782
\| * \| \| \| \| \| \| \| \|	Format extra help page text like wiki	Bastian Blank	2019-04-27	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The instance specific help text was not rendered in any way compatible with the look and feel of the rest of the page. Just re-use the wiki style like the rest of the page.
* \| \| \| \| \| \| \| \| \|	Prefer usage of helper `expanded_by_default?`	Peter Leitzen	2019-04-29	11	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using `Rails.env.test?` in views.
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-11031-ee-diff-projects' into 'master'	Phil Hughes	2019-04-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Fixes EE differences for app/views/projects/new.html.haml See merge request gitlab-org/gitlab-ce!27617
\| * \| \| \| \| \| \| \| \| \|	Fixes EE differences for app/views/projects/new.html.haml	Filipa Lacerda	2019-04-26	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'use-keyword-args-for-databuilder-push' into 'master'	Douglas Barbosa Alexandre	2019-04-29	2	-13/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088
\| * \| \| \| \| \| \| \| \| \| \|	Use all keyword args for DataBuilder::Push.build()	Jonathon Reinhart	2019-04-25	2	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \|