Merge branch 'devel' into 'master'

Typo fix + coverage adaption

See merge request oliver/ivatar!204

.gitlab-ci.yml

@@ -14,6 +14,7 @@ before_script:
 
 test_and_coverage:
   stage: test
+  coverage: '/^TOTAL.*\s+(\d+\%)$/'
   script:
     - echo 'from ivatar.settings import TEMPLATES' > config_local.py
     - echo 'TEMPLATES[0]["OPTIONS"]["debug"] = True' >> config_local.py

ivatar/ivataraccount/templates/profile.html

@@ -113,7 +113,7 @@
               </li>
               <li class="email-delete">
                 <button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this email address?' %}')">
-                  Delete Email Adress
+                  Delete Email Address
                 </button>
               </li>
             </ul>
@@ -135,7 +135,7 @@
               </li>
               <li class="email-delete">
                 <button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this email address?' %}')">
-                  Delete Email Adress
+                  Delete Email Address
                 </button>
               </li>
             </ul>