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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix EKS formattingfix-formatting-eks-docs	Joshua Lambert	2018-11-02	1	-1/+4
\|
*	Merge branch 'ccr/51520_change_milestone_email' into 'master'11-5-stable-prepare-rc1	Robert Speicher	2018-11-02	21	-5/+399
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add email for milestone change Closes #51520 See merge request gitlab-org/gitlab-ce!22279
\| *	Add email for milestone change	Chantal Rollison	2018-11-02	21	-5/+399
\|/
*	Merge branch '51716-create-kube-namespace' into 'master'	Kamil Trzciński	2018-11-02	33	-341/+873
\|\ \| \| \| \| \| \| \| \|	Incorporates Kubernetes Namespace into Cluster's flow See merge request gitlab-org/gitlab-ce!22011
\| *	Incorporates Kubernetes Namespace into Cluster's flow	Thong Kuah	2018-11-02	33	-341/+873
\|/
*	Merge branch 'ml-fix-logging-qa' into 'master'	Sean McGivern	2018-11-02	2	-4/+4
\|\ \| \| \| \| \| \| \| \|	Don't log fabricate args See merge request gitlab-org/gitlab-ce!22753
\| *	Don't log fabricate args	Mark Lapierre	2018-11-02	2	-4/+4
\| \| \| \| \| \| \| \|	Prevents logging of sensitive data
* \|	Merge branch 'rd-set-missing-fields-on-migration' into 'master'	Douwe Maan	2018-11-02	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a migration that causes error on some legacy DBs Closes #46862 See merge request gitlab-org/gitlab-ce!22761
\| * \|	Fixes a migration that causes error on some legacy DBsrd-set-missing-fields-on-migration	Rubén Dávila	2018-11-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Looks like there are some legacy GitLab databases that have a NOT NULL constraint for the `created_at` and `updated` fields. This change fixes the migration by adding a default value to those columns and I think we always should have it in mind when inserting DB records through raw SQL.
* \| \|	Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'	Douwe Maan	2018-11-02	7	-4/+56
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cannot add label to issue from board Closes #51620 See merge request gitlab-org/gitlab-ce!22475
\| * \| \|	Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-board	Brett Walker	2018-10-31	4	-4/+4
\| \| \| \|
\| * \| \|	Dynamically store the valid label endpoint	Brett Walker	2018-10-31	7	-4/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.
* \| \| \|	Merge branch 'top_level_clusters_controller' into 'master'	Kamil Trzciński	2018-11-02	43	-318/+634
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Top level clusters controller See merge request gitlab-org/gitlab-ce!22438
\| * \| \| \|	Use polymorphic_paths where we cantop_level_clusters_controller	Thong Kuah	2018-11-02	2	-28/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To reduce the number of abstract methods, use polymorphic_paths for collection routes. Unfortunately for member routes, polymorphic_paths does not support namespaced classes, so still continue to override methods.
\| * \| \| \|	Remove method as using nested resource routes	Thong Kuah	2018-11-02	7	-17/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We introduced hidden_clusterable_fields in this MR but it is no longer needed as we have gone back to nested resource routes which should provide the params such as `project_id`.
\| * \| \| \|	Add missing specs for Presenter	Thong Kuah	2018-11-02	2	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add missing interface in abstract class.
\| * \| \| \|	Resolve controller sharing concern	Thong Kuah	2018-11-01	38	-107/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
\| * \| \| \|	Restore 403 functionality for external auth (EE)	Thong Kuah	2018-11-01	4	-9/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we unhooked ClustersController from Project::ApplicationsController, we missed an EE override to handle_not_found_or_authorized. Rather than carry on with override RoutingActions, make a specific proc for Project that we override in EE instead. Use that proc in both Clusters::BaseController and Project::ApplicationsController.
\| * \| \| \|	Move view and path concerns to presenters	Thong Kuah	2018-11-01	13	-60/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move show path for cluster to ClusterPresenter - Create ClusterablePresenter to encapsulate logic. Consolidates scattered methods from BaseController and ClustersHelper into an object.
\| * \| \| \|	Abstract out project out of ClustersController	Thong Kuah	2018-11-01	18	-75/+168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To the extent possible swap out `project` with `clusterable` - Abstract paths for showing cluster or clusters. This will allow us to swap in alternative paths for group level cluster - Push :project_id and :namespace_id params from the URL to the POST body. - Create a nice helper for to generate links for the destroy action For some reason, spec :project_id and :namespace_id param are not going through `to_param` for a JSON format. Manually call `to_param` to fix specs. - Move :layout to BaseController
\| * \| \| \|	Convert clusters to use a top-level controller	Thong Kuah	2018-11-01	38	-62/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
* \| \| \| \|	Merge branch '28249-add-pagination' into 'master'	Kamil Trzciński	2018-11-02	10	-42/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds pagination to pipelines table in merge request & commit page Closes #28249 See merge request gitlab-org/gitlab-ce!22696
\| * \| \| \| \|	Adds pagination to pipelines table in merge request page28249-add-pagination	Filipa Lacerda	2018-10-31	10	-42/+98
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-scheduled-flag-to-job-entity' into 'master'	Kamil Trzciński	2018-11-02	5	-1/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add scheduled flag to job entity See merge request gitlab-org/gitlab-ce!22710
\| * \| \| \| \| \|	Add scheduled flag to job entity	Shinya Maeda	2018-11-02	5	-1/+17
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ce-jej/group-saml-discovery-token' into 'master'	Kamil Trzciński	2018-11-02	2	-3/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TokenAuthenticatable allows non-unique tokens See merge request gitlab-org/gitlab-ce!22748
\| * \| \| \| \| \|	TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-token	James Edwards-Jones	2018-10-31	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoids needing an index to repeatedly check that the token doesn't already exist when saving.
* \| \| \| \| \| \|	Merge branch 'remove-ci_enable_scheduled_build-feature-flag' into 'master'	Kamil Trzciński	2018-11-02	5	-54/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ci_enable_scheduled_build feature flag Closes #52183 See merge request gitlab-org/gitlab-ce!22742
\| * \| \| \| \| \| \|	Remove ci_enable_scheduled_build feature flag	Shinya Maeda	2018-11-02	5	-54/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'sh-optimize-reload-diffs-service' into 'master'	Sean McGivern	2018-11-02	6	-11/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
\| * \| \| \| \| \| \|	Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-service	Stan Hu	2018-11-01	2	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Avoidp loading merge request diff files when not needed	Stan Hu	2018-11-01	2	-3/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Significantly cut memory usage and SQL queries when reloading diffs	Stan Hu	2018-11-01	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By preloading certain models with the diff, we can eliminate many N+1 queries. For a push to the staging GitLab.com www-gitlab-com repository, this eliminates over 3000 SQL queries and appears to bring down the RSS usage by several gigabytes. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* \| \| \| \| \| \| \|	Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' ↵	Sean McGivern	2018-11-02	3	-1/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716
\| * \| \| \| \| \| \| \|	Fix typo in labels_helper_spec.rb52548-links-in-tabs-of-the-labels-index-pages-ends-with-html	Dmitriy Zaporozhets	2018-11-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix bug when links in tabs of the labels index pages ends with .html	Dmitriy Zaporozhets	2018-10-31	3	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'ab-45608-stuck-mr-query' into 'master'	Sean McGivern	2018-11-02	3	-1/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to find stuck merge requests. Closes #45608 See merge request gitlab-org/gitlab-ce!22749
\| * \| \| \| \| \| \| \| \|	Add index to find stuck merge requests.ab-45608-stuck-mr-query	Andreas Brandl	2018-11-01	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/45608#note_113803790 for query and plan. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45608.
* \| \| \| \| \| \| \| \| \|	Merge branch 'gl-ui-progress-bar' into 'master'	Phil Hughes	2018-11-02	3	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitlab-ui's progress bar from global See merge request gitlab-org/gitlab-ce!22705
\| * \| \| \| \| \| \| \| \| \|	Remove gitlab-ui's progress bar from global	Clement Ho	2018-11-02	3	-2/+10
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into dev-master	Jan Provaznik	2018-11-02	456	-3331/+4717
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'kinolaev-master-patch-91872' into 'master'	Dmitriy Zaporozhets	2018-11-02	2	-1/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change HELM_HOST in Auto-DevOps to work behind proxy See merge request gitlab-org/gitlab-ce!22596
\| \| * \| \| \| \| \| \| \| \| \|	Change HELM_HOST in Auto-DevOps to work behind proxy	Sergej	2018-11-01	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'	Evan Read	2018-11-01	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link Bitbucket Server from import index page See merge request gitlab-org/gitlab-ce!22752
\| \| * \| \| \| \| \| \| \| \| \| \|	Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docs	Stan Hu	2018-11-01	1	-1/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-generators-not-always-working' into 'master'	Robert Speicher	2018-11-01	1	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "rails g migration" not always using migration templates Closes #52651 See merge request gitlab-org/gitlab-ce!22592
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-working	Stan Hu	2018-10-25	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normally, this is what's supposed to happen when you invoke `rails g generate migration`: 1. `Rails.application.load_generators` is called here: https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129 2. This loads the local `generator_templates` path in https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69. However, when metrics are enabled, the application is eager loaded here in the initializer. This short-circuits the `load_generators` and loads `ActiveRecord::Generators::MigrationGenerator` automatically, so the custom path is never loaded properly. With this change, we skip the initializing of metrics and eager loading if generators are in use. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace-tooltip-in-markdown-component' into 'master'	Clement Ho	2018-11-01	3	-10/+15
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Replace tooltip in markdown component with gl-tooltip	George Tsiolis	2018-10-31	3	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'user-model-merge-conflicts' into 'master'	Robert Speicher	2018-11-01	2	-2/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697