From a1931c8c7e368146e324f8a954c2d81392261467 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 28 Jan 2019 11:47:56 -0700
Subject: [PATCH 1/2] SHIBUI-1141 Fixed issue with modal popping up
 unexpectedly

---
 ui/src/app/app.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index fe988c62f..f205534ad 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -24,6 +24,7 @@
                     <a class="nav-link"
                         routerLink="/metadata/resolver/new"
                         routerLinkActive="active"
+                        queryParamsHandling="preserve"
                         [attr.aria-label]="'action.add-new-source' | translate"
                         role="button">
                         <i class="fa fa-cube fa-fw" aria-hidden="true"></i>

From 25252ffb18577dcdba939ee79c497388b5b139e4 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Mon, 28 Jan 2019 14:13:28 -0700
Subject: [PATCH 2/2] [NOJIRA]

Removed reference to deleted configuration class.
---
 pac4j-module/src/main/resources/META-INF/spring.factories | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pac4j-module/src/main/resources/META-INF/spring.factories b/pac4j-module/src/main/resources/META-INF/spring.factories
index f46ede845..90f792d84 100644
--- a/pac4j-module/src/main/resources/META-INF/spring.factories
+++ b/pac4j-module/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   net.unicon.shibui.pac4j.Pac4jConfiguration,\
   net.unicon.shibui.pac4j.WebSecurity,\
-  net.unicon.shibui.pac4j.Pac4jConfigurationProperties,\
-  net.unicon.shibui.pac4j.CustomPropertiesConfiguration
\ No newline at end of file
+  net.unicon.shibui.pac4j.Pac4jConfigurationProperties
\ No newline at end of file