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.

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

grafana/toolkit: Replace webpack ng annotate plugin with babel-plugin-angularjs-annotate #18005

Merged
merged 1 commit into from
Jul 9, 2019

Conversation

dprokop
Copy link
Member

@dprokop dprokop commented Jul 9, 2019

This fixes error caused by ng-annotate mentioned in #17819 (comment)

Copy link
Member

@ryantxu ryantxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dprokop dprokop merged commit b44be99 into master Jul 9, 2019
@dprokop dprokop deleted the gtl/ng-annotate branch July 9, 2019 15:22
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 10, 2019
…-mapping-to-field

* grafana/master: (21 commits)
  Chore: bump master version number to 6.4.0-pre
  Explore/Loki: Display live tailed logs in correct order (grafana#18031)
  Fix unused variable errors (grafana#18030)
  Docs: First draft of whats new in 6.3 (grafana#17962)
  Packages: create shared tsconfig.json (grafana#18010)
  CLI: Fix encrypt-datasource-passwords fails with sql error (grafana#18014)
  LDAP: Adds bind before searching LDAP for non-login cases. (grafana#18023)
  Users: show badges for each auth provider (grafana#17869)
  Loki: Don't use _ numerical separator (grafana#18016)
  grafana-cli: allow installing plugins from a local zip file (grafana#18021)
  grafana/toolkit: Copy or extract static files (grafana#18006)
  Packages: Use lerna for release orchestration (grafana#17985)
  AnnoList: add alpha annotations list plugin (grafana#17187)
  grafana/toolkit: Use babel-plugin-angularjs-annotate (grafana#18005)
  CSV Export: Timezone based on dashboard setting (grafana#18002)
  LDAP: Adds back support for single bind. (grafana#17999)
  Reducers: consistent result for first/last reducer shortcut (grafana#17911)
  SAML: Show SAML login button even if OAuth is disabled (grafana#17993)
  Fix: Break redirect loop if oauth_auto_login = true and OAuth login fails (grafana#17974)
  Refactor: fix range util imports (grafana#17988)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants