Unverified Commit b78ef83c authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge branch 'release/0.6.1.0' into next-minor

parents 9f38a424 e18627f5

Changelog.md

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ Note: Although this is a minor release, the configuration file changed because t 
* Fix message modal on profile page [#7137](https://github.com/diaspora/diaspora/pull/7137)

* Display error message when aspect membership changes fail [#7132](https://github.com/diaspora/diaspora/pull/7132)

* Avoid the creation of pod that are none [#7145](https://github.com/diaspora/diaspora/pull/7145)

* Fixed tag pages with alternate default aspect settings [#7262](https://github.com/diaspora/diaspora/pull/7162)

* Suppressed CSP related deprecation warnings [#7263](https://github.com/diaspora/diaspora/pull/7163)



## Features

* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

app/views/status_messages/bookmarklet.html.haml

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 
      .col-md-12

        %h4

          =t('bookmarklet.post_something')

        = render partial: 'publisher/publisher', locals: { aspect: :profile, :selected_aspects => @aspects,  :aspect_ids => @aspect_ids }
 
        = render partial: "publisher/publisher", locals: publisher_aspects_for(nil)

app/views/tags/show.haml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
            = @stream.display_tag_name



        - if current_user

          = render 'publisher/publisher', :selected_aspects => @stream.aspect_ids, :aspect_ids => @stream.aspect_ids, aspect: @stream.aspect

          = render "publisher/publisher", publisher_aspects_for(@stream)



        #main_stream.stream

config/initializers/secure_headers.rb

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ SecureHeaders::Configuration.default do |config| 
  csp[:report_uri] = [AppConfig.settings.csp.report_uri] if AppConfig.settings.csp.report_uri.present?



  if AppConfig.settings.csp.report_only?

    config.csp = SecureHeaders::OPT_OUT

    config.csp_report_only = csp

  else

    config.csp = csp