Merge branch 'staging' into remove-delete-functionality

2019-12-18 15:20:41 -05:00
parent 2b884f2c85 325441dd42
commit ff0abe7dce
30 changed files with 382 additions and 156 deletions
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -13,6 +13,9 @@

 {% block application_content %}

+  {% if show_flash -%}
+    {% include "fragments/flash.html" %}
+  {%- endif %}
  <h3>{{ 'portfolios.applications.settings.name_description' | translate }}</h3>

  {% if user_can(permissions.EDIT_APPLICATION) %}