Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-05Revert "LfsToken uses JSONWebToken::HMACToken by default"🤖 GitLab Bot 🤖
This reverts commit 22954f220231281360377922b709efb904559949
2018-12-05Change merge request value to 10Shinya Maeda
2018-12-05Merge request pipelinesShinya Maeda
2018-12-05Merge branch 'ashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug' into 'master'Stan Hu
Geo: Backport of EE MR Geo: Fix push to secondary over SSH for LFS See merge request gitlab-org/gitlab-ce!22856
2018-12-05Fix list that doesn't render properlyEvan Read
2018-12-05Add Project#lfs_http_url_to_repo from EEAsh McKenzie
For CE, #lfs_http_url_to_repo calls #http_url_to_repo where as for EE we examine for a Geo setup so we can support push to secondary for LFS.
2018-12-05Add missing spec coverage for LfsTokenAsh McKenzie
Added specs for #deploy_key_pushable?() and #type()
2018-12-05LfsToken uses JSONWebToken::HMACToken by defaultAsh McKenzie
LfsToken::HMACToken#token_valid?() will be examined and if false, look in redis via LfsToken::LegacyRedisDeviseToken#token_valid?().
2018-12-05Merge branch 'docs-fix-submodule-api-example' into 'master'Evan Read
Docs - Fix repository submodule API example See merge request gitlab-org/gitlab-ce!23561
2018-12-05Use user? insteadAsh McKenzie
2018-12-05Merge branch 'sh-bump-workhorse-7.4.0' into 'master'Nick Thomas
Upgrade GitLab Workhorse to v7.4.0 See merge request gitlab-org/gitlab-ce!23557
2018-12-05Use a 32-byte version of db_key_base for web hooksNick Thomas
AES-256-GCM cipher mode requires a key that is exactly 32 bytes long. We already handle the case when the key is too long, by truncating, but the key can also be too short in some installations. Switching to a key that is always exactly the right length (by virtue of right-padding ASCII 0 characters) allows encryption to proceed, without breaking backward compatibility. When the key is too short, encryption fails with an `ArgumentError`, causing the web hooks functionality to be unusable. As a result, zero rows can exist with values encrypted with the too-short key. When the key is too long, it is silently truncated. In this case, the key is unchanged, so values encrypted with the new too-long key will still be successfully decrypted.
2018-12-05Merge branch 'leipert-foward-svg' into 'master'Mike Greiling
Forward gitlab-svg See merge request gitlab-org/gitlab-ce!23543
2018-12-05Shift to class methods for RefreshServiceThong Kuah
As we don't use any instance attributes and we don't seem to have any commonalities between the cluster and the project variant.
2018-12-05Merge branch '327-basic-login-logout-qa' into 'master'Dan Davison
[QA] Add a log-out step and expectation to `qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb` Closes #52700 See merge request gitlab-org/gitlab-ce!23554
2018-12-05Do not attempt retry until allow_failure has been removedddavison
2018-12-05Rename to CreateOrUpdateServiceAccountServiceThong Kuah
This reflects how we now create or update
2018-12-05Rename to CreateOrUpdateServiceAccountServiceThong Kuah
This reflects how we now create or update
2018-12-05DRY up refresh serviceThong Kuah
The two pieces of code are identical so use a private method
2018-12-05Make subgroup specs :nested_groupsThong Kuah
Subgroups are not supported in mySQL. I changed Namespace#root_ancestor to return from self_and_ancestors as a bugfix. ``` 184 # Returns all the ancestors of the current namespaces 185 def ancestors 186 return self.class.none unless parent_id 187 188 Gitlab::GroupHierarchy 189 .new(self.class.where(id: parent_id)) 190 .base_and_ancestors 191 end ``` So it seems like on mySQL we accidentally returned the parent group : ``` ancestors = self.class.where(id: parent_id) ancestors.reorder(nil).find_by(parent_id: nil) ``` Project#root_namespace is used only by shared_runners_limit_namespace and all the tests for shared_runner_minutes_on_root_namespace are only enabled on `:nested_groups` `when :shared_runner_minutes_on_root_namespace is enabled', :nested_groups` We very clearly state in https://docs.gitlab.com/ee/user/group/subgroups/ that ` Nested groups are only supported when you use PostgreSQL`, so I think I will fix forward and add `:nested_groups` to the two failing feature specs.
2018-12-05Eager load clusters to prevent N+1Thong Kuah
This also means we need to apply the `current_scope` otherwise this method will return all clusters associated with the groups regardless of any scopes applied to this method
2018-12-05Unify into :group_clusters feature flagThong Kuah
With this MR, group clusters is now functional, so default to enabled. Have a single setting on the root ancestor group to enabled or disable group clusters feature as a whole
2018-12-05Various improvements to hierarchy sortingThong Kuah
- Rename ordered_group_clusters_for_project -> ancestor_clusters_for_clusterable - Improve name of order option. It makes much more sense to have `hierarchy_order: :asc` and `hierarchy_order: :desc` - Allow ancestor_clusters_for_clusterable for group - Re-use code already present in Project
2018-12-05Create k8s namespace for project in group clustersThong Kuah
AFAIK the only relevant place is Projects::CreateService, this gets called when user creates a new project, forks a new project and does those things via the api. Also create k8s namespace for new group hierarchy when transferring project between groups Uses new Refresh service to create k8s namespaces - Ensure we use Cluster#cluster_project If a project has multiple clusters (EE), using Project#cluster_project is not guaranteed to return the cluster_project for this cluster. So switch to using Cluster#cluster_project - at this stage a cluster can only have 1 cluster_project. Also, remove rescue so that sidekiq can retry
2018-12-05Teach Cluster about #all_projectsThong Kuah
For project level, it's the project directly associated. For group level, it's the projects under that group.
2018-12-05Teach Project about #all_clustersThong Kuah
This returns a union of the project level clusters and group level clusters associated with this project.
2018-12-05Add association project -> kubernetes_namespacesThong Kuah
kubernetes_namespaces is not needed for project import/export as it tracks internal state of kubernetes integration
2018-12-05Assert all_projects work for child groupsThong Kuah
2018-12-05Deploy to clusters for a project's groupsThong Kuah
Look for matching clusters starting from the closest ancestor, then go up the ancestor tree. Then use Ruby to get clusters for each group in order. Not that efficient, considering we will doing up to `NUMBER_OF_ANCESTORS_ALLOWED` number of queries, but it's a finite number Explicitly order query by depth This allows us to control ordering explicitly and also to reverse the order which is useful to allow us to be consistent with Clusters::Cluster.on_environment (EE) which does reverse ordering. Puts querying group clusters behind Feature Flag. Just in case we have issues with performance, we can easily disable this
2018-12-05Modify service so that it can be re-runThong Kuah
If the service fails mid-point, then we should be able to re-run this service. So, detect presence of any previously created Kubernetes resource and update or create accordingly. Fix specs accordingly. In the case of finalize_creation_service_spec.rb, I decided to stub out the async worker rather than maintaining individual stubs for various kubeclient calls for that worker.
2018-12-05Call ClusterPlatformConfigureWorker to re-use codeThong Kuah
We remove configure_project_service_account and replace ClusterPlatformConfigureWorker as they perform exactly the same piece of work. This also makes GKE cluster creation to be the same as Adding existing cluster - they both now use another worker to execute CreateOrUpdateNamespaceService.
2018-12-05Merge branch 'docs-fix-type-bitbucket-import' into 'master'Stan Hu
Fixed typo in bitbucket import See merge request gitlab-org/gitlab-ce!23568
2018-12-04Fixed typo in bitbucket importJason Colyer
2018-12-04Merge branch 'ce-jej/group-saml-unlink-from-account' into 'master'Stan Hu
[CE] Backport GroupSAML unlink changes See merge request gitlab-org/gitlab-ce!23536
2018-12-04Add example email on push notification to docsJames Ramsay
2018-12-04Merge branch 'gt-remove-pronunciation-tip-for-knative' into 'master'Mike Greiling
Remove pronunciation tip for knative Closes #54724 See merge request gitlab-org/gitlab-ce!23549
2018-12-04Allow review app smoke test to fail for nowMek Stittri
2018-12-04Merge branch 'define-default-value-for-only-except-keys' into 'master'Kamil Trzciński
Define the default value for only/except policies See merge request gitlab-org/gitlab-ce!23531
2018-12-04Merge branch 'disable-automatic-merge' into 'master'Marin Jankovski
Temporarily disable automatic merging See merge request gitlab-org/gitlab-ce!23560
2018-12-04Revert "Revert "Remove runner token indices from db schema as well""Yorick Peterse
This reverts commit d7291c6499563fd9b06b7b3e282a5d09288f5684
2018-12-04Temporarily disable automatic mergingYorick Peterse
It appears that for some jobs (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/129705025 for example) we process a range of commits far greater than necessary, which can lead to commits getting reverted that were merged a long time ago. [ci skip]
2018-12-04Revert "Remove runner token indices from db schema as well"🤖 GitLab Bot 🤖
This reverts commit c3d0f1294c237853b9d5a3b13f3ea7a2abb84eb4
2018-12-04Update doc/api/repository_submodules.mdWill Chandler
2018-12-04Fixed diff files not expandingPhil Hughes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868
2018-12-04Upgrade GitLab Workhorse to v7.4.0Stan Hu
2018-12-04Add a log-out step and expectation to log-in testMesut Güneş
2018-12-04Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas
Encrypt runners tokens Closes #51232 and #52931 See merge request gitlab-org/gitlab-ce!23412
2018-12-04Merge branch 'dm-update-batch-loader' into 'master'Stan Hu
Update batch-loader dependency See merge request gitlab-org/gitlab-ce!23535
2018-12-04Replace admin sidebar feature spec with view specRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-04Merge branch 'diff-fix-expanding' into 'master'Filipa Lacerda
Fixed multiple diff line discussions not expanding Closes #53600 See merge request gitlab-org/gitlab-ce!23539