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

[ui/doc_viewer] ensure the ui/render_directive is imported #7629

Merged
merged 2 commits into from
Jul 5, 2016
Merged

[ui/doc_viewer] ensure the ui/render_directive is imported #7629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058475f
[ui/doc_viewer] ensure the ui/render_directive is imported
Jul 5, 2016
e98c3d4
[ci] tweak ci scripts to debug
Jul 5, 2016
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
1 change: 1 addition & 0 deletions src/ui/public/doc_viewer/doc_viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import $ from 'jquery';
import uiModules from 'ui/modules';
import DocViewsProvider from 'ui/registry/doc_views';

import 'ui/render_directive';
import 'ui/doc_viewer/doc_viewer.less';

uiModules.get('kibana')
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/jenkins_build_snapshot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -e

"$(dirname $0)/jenkins_setup.sh"

"$(npm bin)/grunt" build;
"$GRUNT" build;
8 changes: 8 additions & 0 deletions test/scripts/jenkins_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,11 @@ nvm install "$(cat .node-version)"
### NPM ###
###*****###
npm install


if [ -z "$(npm bin)" ]; then
echo "npm does not know where it stores executables..... huh??"
exit 1
fi

export GRUNT="$(npm bin)/grunt"
2 changes: 1 addition & 1 deletion test/scripts/jenkins_unit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -e

"$(dirname $0)/jenkins_setup.sh"

xvfb-run "$(npm bin)/grunt" jenkins:unit;
xvfb-run "$GRUNT" jenkins:unit;