[midPoint-git] [Evolveum/midpoint] 3ba187: Improved merging of archetype/view display informa...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3ba18765ebea4e0028e39b2f9118873b1fde73c2
      https://github.com/Evolveum/midpoint/commit/3ba18765ebea4e0028e39b2f9118873b1fde73c2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-01-18 (Fri, 18 Jan 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileCompiler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestArchetypes.java
    M model/model-intest/src/test/resources/archetypes/role-user-administrator.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ObjectCollectionViewAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/DisplayTypeAsserter.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/IconTypeAsserter.java

  Log Message:
  -----------
  Improved merging of archetype/view display information (MID-3151)



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.