Merge pull request #4396 from movilla/registration_mobile_width

Fix layout on the registration page for mobile

Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2013-08-14 21:28:17 +02:00
commit 2207069b86
2 changed files with 2 additions and 1 deletions

View file

@ -36,6 +36,7 @@
* Restore truncated URLs when posting to Twitter [#4211](https://github.com/diaspora/diaspora/issues/4211)
* Fix mobile search tags [#4392](https://github.com/diaspora/diaspora/issues/4392)
* Remove placeholders for name fields in settings (no more Sofaer) [#4385](https://github.com/diaspora/diaspora/pull/4385)
* Problems with layout the registration page for mobile. [#4396](https://github.com/diaspora/diaspora/issues/4396)
## Features
* Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)

View file

@ -5,7 +5,7 @@
class RegistrationsController < Devise::RegistrationsController
before_filter :check_registrations_open_or_vaild_invite!, :check_valid_invite!
layout "with_header", :only => [:new]
layout ->(c) { request.format == :mobile ? "application" : "with_header" }, :only => [:new]
before_filter -> { @css_framework = :bootstrap }, only: [:new]
def create