- 01 Nov, 2018 7 commits
-
-
Thong Kuah authored
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
-
Thong Kuah authored
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.
-
Thong Kuah authored
Restore app/helpers/clusters_helper.rb to CE, move override to EE module.
-
Thong Kuah authored
- Move show path for cluster to ClusterPresenter - Create ClusterablePresenter to encapsulate logic. Consolidates scattered methods from BaseController and ClustersHelper into an object.
-
Thong Kuah authored
- EE: Restore metrics json endpoint for cluster Use new controller so that we have one less EE prepend. - EE: Fix assets and views for ClustersController We moved from Projects::ClustersController to ClustersController. So, some of the EE only views and assets needs to be updated. Also update some EE only controller specs to ClustersController - EE: Update override of can_create_cluster? The method signature changed in CE to accomodate group as a `clusterable`. Correspondingly, update the method to use `clusterable`. This presumes multiple group level clusters is available at the same license as projet level clusters which is GitLab Premium. Also fix related specs
-
Thong Kuah authored
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
-
Thong Kuah authored
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/
-
- 31 Oct, 2018 4 commits
-
-
Grzegorz Bizon authored
Renaming Secret Variables in the codebase (EE Port) See merge request gitlab-org/gitlab-ee!7964
-
Marcel Amirault authored
-
Douglas Barbosa Alexandre authored
Absorb product into factory Closes gitlab-ce#52992 See merge request gitlab-org/gitlab-ee!8100
-
Lin Jen-Shin authored
-
- 30 Oct, 2018 29 commits
-
-
Douwe Maan authored
(EE-Port) Add language param to highlight See merge request gitlab-org/gitlab-ee!7276
-
Filipa Lacerda authored
Prettify all the things (EE) See merge request gitlab-org/gitlab-ee!8114
-
Mike Greiling authored
-
Mike Greiling authored
-
Sean McGivern authored
CE upstream - 2018-10-30 04:22 UTC See merge request gitlab-org/gitlab-ee!8139
-
Kushal Pandya authored
-
Filipa Lacerda authored
Fix Pod Log topbar position when perf bar is disabled Closes #7203 See merge request gitlab-org/gitlab-ee!7853
-
Simon Knox authored
-
Filipa Lacerda authored
Merge branch '7433-mirroring-repos-direction-select-empty-and-consistency-across-offerings' into 'master' Remove unneeded can_pull and can_push checks for ee mirror_repos_form Closes #7433 See merge request gitlab-org/gitlab-ee!8077
-
Sean McGivern authored
-
Kushal Pandya authored
-
Filipa Lacerda authored
[CI] Add missing new lines Closes #8191 See merge request gitlab-org/gitlab-ee!8141
-
Jan Provaznik authored
Otherwise jasmine/new-line-before-expect is failing
-
Jan Provaznik authored
-
GitLab Bot authored
# Conflicts: # app/controllers/projects/issues_controller.rb # locale/gitlab.pot # spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js [ci skip]
-
Stan Hu authored
Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
-
Stan Hu authored
CE upstream - 2018-10-29 11:21 UTC Closes #7760 See merge request gitlab-org/gitlab-ee!8131
-
Mark Chao authored
This gives flexiblity to avoid duplicated query of Project.
-
Mark Chao authored
-
Mark Chao authored
Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
-
Mark Chao authored
This is to DRY the repeated file size check. Move spec and constants to Highlight
-
Mark Chao authored
This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
-
Mark Chao authored
Force FoundBlob to use BlobPresenter
-
Mark Chao authored
Ported from Highlight class since it as a concept is more related to blob, and this allows more flexibility.
-
Mark Chao authored
seed_helper changed because testing requires attributes file in repo, but repo was not a real git repo but instead faked.
-
Stan Hu authored
Don't synchronize default branch for pull mirrors Closes #8108 See merge request gitlab-org/gitlab-ee!8138
-
Evan Read authored
docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
-
Evan Read authored
docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ee!8064
-
Evan Read authored
Geo: Stale docs on frequency of Geo replication Closes #7858 See merge request gitlab-org/gitlab-ee!8061
-