Merge branch 'master' into feature/SHIBUI-704

TIER · Nov 28, 2018 · 6111e57 · 6111e57
2 parents 972fdc1 + 10821df
commit 6111e57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -382,3 +382,6 @@ gradle-app.setting
 
 # Do not ignore typescript config
 !tsconfig.json
+
+# pac4j
+pac4j-module/out/
diff --git a/run-app.sh b/run-app.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-./gradlew -Dshibui.logout-url=/dashboard "$@" clean bootRun npm_run_start --parallel
+./gradlew -Dspring.profiles.active=no-auth -Dshibui.logout-url=/dashboard "$@" clean bootRun npm_run_start --parallel