Merge branch 'next-minor' into develop

Changelog.md

@@ -26,6 +26,7 @@
 
 ## Features
 * Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
+* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
 
 # 0.6.6.0
 

Gemfile

@@ -112,6 +112,7 @@ source "https://rails-assets.org" do
 
   gem "rails-assets-autosize",                            "3.0.20"
   gem "rails-assets-blueimp-gallery",                     "2.25.0"
+  gem "rails-assets-jquery.are-you-sure",                 "1.9.0"
   gem "rails-assets-jquery-placeholder",                  "2.3.1"
   gem "rails-assets-jquery-textchange",                   "0.2.3"
   gem "rails-assets-perfect-scrollbar",                   "0.6.16"

Gemfile.lock

@@ -529,6 +529,8 @@ GEM
       rails-assets-jquery (>= 1.6)
     rails-assets-jquery-textchange (0.2.3)
       rails-assets-jquery
+    rails-assets-jquery.are-you-sure (1.9.0)
+      rails-assets-jquery (>= 1.4.2)
     rails-assets-jquery.slimscroll (1.3.8)
     rails-assets-jquery.ui (1.11.4)
       rails-assets-jquery (>= 1.6)
@@ -847,6 +849,7 @@ DEPENDENCIES
   rails-assets-jquery (= 3.1.1)!
   rails-assets-jquery-placeholder (= 2.3.1)!
   rails-assets-jquery-textchange (= 0.2.3)!
+  rails-assets-jquery.are-you-sure (= 1.9.0)!
   rails-assets-markdown-it (= 8.3.0)!
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
   rails-assets-markdown-it-diaspora-mention (= 1.2.0)!

app/assets/javascripts/app/pages/settings.js

@@ -14,6 +14,7 @@ app.pages.Settings = Backbone.View.extend({
       el: $(".aspect_dropdown"),
       form: $("#post-default-aspects")
     });
+    $("#update_profile_form").areYouSure();
   }
 });
 // @license-end

app/assets/javascripts/main.js

@@ -41,5 +41,6 @@
 //= require blueimp-gallery/blueimp-gallery-indicator
 //= require leaflet
 //= require api/authorization_page
-// = require bootstrap-markdown/bootstrap-markdown
-// = require helpers/markdown_editor
+//= require bootstrap-markdown/bootstrap-markdown
+//= require helpers/markdown_editor
+//= require jquery.are-you-sure

features/desktop/edits_profile.feature

@@ -33,6 +33,10 @@ Feature: editing your profile
     And I should see "#starwars" within "ul#as-selections-tags"
     And the "#profile_public_details" bootstrap-switch should be off
 
+    When I fill in "profile_bio" with "This is a new awesome bio"
+    And I reject the alert after I follow "My activity"
+    Then I should be on my edit profile page
+
     When I fill in "profile[tag_string]" with "#kamino"
     And I press the first ".as-result-item" within ".as-results"
     And I toggle the "#profile_public_details" bootstrap-switch