nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-02-23 06:35:26 +01:00
commit dbdf352a6b
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -131,6 +131,7 @@ Contributions are very welcome, the hard work is done!
* Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707) * Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
## Features ## Features
* Added the footer to conversation pages
# 0.5.7.0 # 0.5.7.0

2
app/controllers/conversations_controller.rb
View file

@ -1,7 +1,5 @@
class ConversationsController < ApplicationController class ConversationsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
layout ->(c) { request.format == :mobile ? "application" : "with_header" }
respond_to :html, :mobile, :json, :js respond_to :html, :mobile, :json, :js
def index def index