root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
105,907 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

92 Commits

Author SHA1 Message Date
GitLab Bot ff430539d5 Add latest changes from gitlab-org/gitlab@master 2020-07-13 15:09:08 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Adriel Santiago b78c370ac5 Add frontend support for cluster health alerts 
Adds a new query text input for metric alerts
 2019-06-06 19:57:28 +00:00
James Edwards-Jones bedb9a3e6d Avoid passing not_found_or_authorized_proc around 
Since this needs to be called on every find_routable!(Project, ...
we can instead move it to a RoutableActions check.
 2019-05-15 17:36:50 +07:00
Thong Kuah 1a1fdf8efe Resolve controller sharing concern 
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
 2018-11-01 19:37:33 +13:00
Thong Kuah 5b3c096c9e Convert clusters to use a top-level controller 
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/
 2018-11-01 18:38:36 +13:00
Thong Kuah 19e1024bb8 Pass in project as kwarg for CreateService 
This enables us to have other options in the future such as passing in
`group:`.

Also, remove project arg from UpdateService, as un-used.

This will help group cluster controller to re-use this services.
 2018-10-15 11:01:09 +13:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers 
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
 2018-09-25 22:43:49 -07:00
Thong Kuah 292d2208e0 Add FE option for users to choose to create a fully RBAC-enabled cluster or not. 
This is similar to the option in the Add Existing cluster form
 2018-09-14 16:26:51 +12:00
Thong Kuah 6f2ad2b604 Enable Kubernetes RBAC for GitLab Managed Apps for existing clusters 2018-09-06 10:03:38 +00:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
Dennis Tang ce0ce1cb19 consolidate back into one controller 2018-06-19 15:01:43 +00:00
Dennis Tang edb89f555b split into gcp and user controllers again 2018-06-05 20:04:40 -07:00
Dennis Tang d363014c36 Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs 
# Conflicts:
#	app/controllers/projects/clusters/gcp_controller.rb
#	app/views/projects/clusters/gcp/_form.html.haml
#	app/views/projects/clusters/gcp/login.html.haml
 2018-05-31 11:28:48 +02:00
Dennis Tang 319ebaefbe update view name for gke dropdown check 2018-05-26 10:02:44 +02:00
Dennis Tang 70c65e827b fix case where token may expire 2018-05-26 01:36:56 +02:00
Dennis Tang 82430b2d46 cleanup 2018-05-26 00:15:00 +02:00
Dennis Tang 250a8aee25 revisions 2018-05-26 00:15:00 +02:00
Dennis Tang 1a30e153a8 combine "create" and "existing" GKE cluster views into one new page 
# Conflicts:
#	app/controllers/projects/clusters/gcp_controller.rb
#	app/views/projects/clusters/gcp/_form.html.haml
 2018-05-26 00:15:00 +02:00
Rémy Coutable 981b8ab7bd
Reduce CE/EE diff in app/controllers/projects/clusters_controller.rb 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-05-24 19:29:29 +02:00
Dylan Griffith 3b320d675f Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changes 
(#42643)
 2018-02-23 09:10:14 +11:00
Dylan Griffith 3d3d09fa9d Schedule Ingress IP address fetch from K8s after clusters page load (#42643) 2018-02-20 13:49:35 +11:00
Winnie Hellmann 0ecd759d73 Replace "cluster" with "Kubernetes cluster" 2018-02-06 10:05:02 +01:00
Matija Čupić 9616e70a08
Allow environment_scope in cluster controllers 2017-12-16 17:28:59 +01:00
Matija Čupić 4882c79301
Remove cluster scope from ClustersController#index 2017-12-11 15:06:45 +01:00
Matija Čupić 4d75901c02
Use ClustersFinder for setting counts 2017-12-05 16:15:17 +01:00
Kamil Trzcinski 2fc29237aa Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-page-with-list-clusters 2017-12-05 13:31:07 +01:00
Kamil Trzcinski 9429514e30 Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clusters 2017-12-05 13:29:41 +01:00
Shinya Maeda 105843a079 Use find instead of find_by! 2017-12-05 18:02:15 +09:00
Matija Čupić f1357a1e15
Remove references of project.cluster from specs 2017-12-04 17:02:18 +01:00
Shinya Maeda c4f91fe43c Optimize Projects::ClustersController#cluster 2017-12-04 22:27:31 +09:00
Shinya Maeda b716bba7e3 Use status polling definitino 2017-12-04 22:21:23 +09:00
Kamil Trzcinski f1cce0cba8 Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-page-with-list-clusters 2017-12-03 22:00:25 +01:00
Kamil Trzcinski 83346192ce Update specs 2017-12-03 21:34:00 +01:00
Kamil Trzcinski b2b4f262d5 First round of tests 2017-12-03 15:33:10 +01:00
Kamil Trzcinski c63641ea86 Filter update params 2017-12-03 15:10:18 +01:00
Kamil Trzcinski 7af2161ca5 Fix controllers and links 2017-12-03 15:00:33 +01:00
Shinya Maeda 6957f939d2 Expand update_params to accept platform_kubernetes_attributes(api_url, etc) 2017-12-03 13:36:10 +01:00
Kamil Trzcinski cd1b1cbfd6 Extend controllers to support a new data structure for manual Kubernetes clusters 2017-12-03 13:36:10 +01:00
Matija Čupić c2bf452c17
Refactor ClustersController pagination test 2017-12-01 18:01:59 +01:00
Matija Čupić 976e22e675
Use strings for @scope in ClustersController#index 2017-11-30 16:41:07 +01:00
Matija Čupić 062f011d32
Default to :all scope for ClustersController#index 2017-11-29 17:22:32 +01:00
Matija Čupić 3de1ba6cfa
Move cluster sourcing from before_action to #index 2017-11-28 14:44:42 +01:00
Matija Čupić 6f72039007
Expose scope to view in ClustersController#index 2017-11-28 14:39:18 +01:00
Filipa Lacerda 18967d6894 Changes after Frontend and UX review: 
- Moves toggle button to a shared location
- Adds tests for toggle button
- Transforms Clusters class into function
- Improves UX
 2017-11-28 13:33:52 +00:00
Matija Čupić 061b496357
Fix symbolization error in #clusters 2017-11-27 18:06:38 +01:00
Matija Čupić aec7bbf10a
Use current_user in ClustersController#clusters 2017-11-27 16:32:55 +01:00
Matija Čupić 554bf24b2a
Add cluster pagination to ClustersController#index 2017-11-27 14:03:35 +01:00
Matija Čupić efc610d32b
Use ClustersFinder in ClustersController#clusters 2017-11-27 13:51:00 +01:00
Matija Čupić 52bc826196
Add cluster counts to ClustersController#index 2017-11-27 13:33:33 +01:00