Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[License Management] NP migration #60250

Merged
merged 19 commits into from
Mar 18, 2020
Merged

[License Management] NP migration #60250

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fb35a72
Update server API route with correct dependencies
sebelga Mar 6, 2020
ea8218f
Move to the "plugins" folder
sebelga Mar 12, 2020
df09d6e
Fix unit tests
sebelga Mar 13, 2020
32c0e77
Remove plugin initialisation from legacy
sebelga Mar 13, 2020
4ae20ac
Camelcase plugin ID + update i18nrc path
sebelga Mar 13, 2020
1f118c1
Add missing first() pipe operator to read license$
sebelga Mar 16, 2020
e9a5516
Cleanup unnecessary hooks
sebelga Mar 16, 2020
b8ae767
Use API_BASE_PATH on server routes
sebelga Mar 16, 2020
29e2c45
Update x-pack/plugins/license_management/server/types.ts
sebelga Mar 17, 2020
70b6eaa
Fix route dependencies plugins import
sebelga Mar 17, 2020
3c5f78d
Remove EUI sass constants import
sebelga Mar 17, 2020
79c8833
Fix failing test
sebelga Mar 17, 2020
dbf05e6
Fix server API route
sebelga Mar 17, 2020
328c4a2
Merge branch 'master' into np-migration/license-management
elasticmachine Mar 17, 2020
0fe8cdf
Fix TS issues
sebelga Mar 17, 2020
9e03738
Merge branch 'master' into np-migration/license-management
elasticmachine Mar 17, 2020
5152933
Merge remote-tracking branch 'upstream/master' into np-migration/lice…
sebelga Mar 17, 2020
453e878
Fix typo
sebelga Mar 17, 2020
446c6c6
Merge branch 'master' into np-migration/license-management
elasticmachine Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"xpack.infra": "plugins/infra",
"xpack.ingestManager": "plugins/ingest_manager",
"xpack.lens": "legacy/plugins/lens",
"xpack.licenseMgmt": "legacy/plugins/license_management",
"xpack.licenseMgmt": "plugins/license_management",
"xpack.licensing": "plugins/licensing",
"xpack.logstash": "legacy/plugins/logstash",
"xpack.main": "legacy/plugins/xpack_main",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { logstash } from './legacy/plugins/logstash';
import { beats } from './legacy/plugins/beats_management';
import { apm } from './legacy/plugins/apm';
import { maps } from './legacy/plugins/maps';
import { licenseManagement } from './legacy/plugins/license_management';
import { indexManagement } from './legacy/plugins/index_management';
import { indexLifecycleManagement } from './legacy/plugins/index_lifecycle_management';
import { spaces } from './legacy/plugins/spaces';
Expand Down Expand Up @@ -52,7 +51,6 @@ module.exports = function(kibana) {
apm(kibana),
maps(kibana),
canvas(kibana),
licenseManagement(kibana),
indexManagement(kibana),
indexLifecycleManagement(kibana),
infra(kibana),
Expand Down
Loading