parent
f7cbb20e11
commit
84d553555e
3 changed files with 4 additions and 6 deletions
|
|
@ -10,6 +10,7 @@
|
||||||
* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
|
* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
|
||||||
* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
|
* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
|
||||||
* Use Bootstrap 3 progress-bar for polls [#7600](https://github.com/diaspora/diaspora/pull/7600)
|
* Use Bootstrap 3 progress-bar for polls [#7600](https://github.com/diaspora/diaspora/pull/7600)
|
||||||
|
* Enable frozen string literals [#7595](https://github.com/diaspora/diaspora/pull/7595)
|
||||||
|
|
||||||
## Bug fixes
|
## Bug fixes
|
||||||
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
|
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
class ConnectionTester
|
class ConnectionTester
|
||||||
include Diaspora::Logging
|
include Diaspora::Logging
|
||||||
|
|
||||||
NODEINFO_SCHEMA = "http://nodeinfo.diaspora.software/ns/schema/1.0".freeze
|
NODEINFO_SCHEMA = "http://nodeinfo.diaspora.software/ns/schema/1.0"
|
||||||
NODEINFO_FRAGMENT = "/.well-known/nodeinfo".freeze
|
NODEINFO_FRAGMENT = "/.well-known/nodeinfo"
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
# Test the reachability of a server by the given HTTP/S URL.
|
# Test the reachability of a server by the given HTTP/S URL.
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,8 @@
|
||||||
# the COPYRIGHT file.
|
# the COPYRIGHT file.
|
||||||
|
|
||||||
module Diaspora
|
module Diaspora
|
||||||
|
|
||||||
class Exporter
|
class Exporter
|
||||||
|
SERIALIZED_VERSION = "2.0"
|
||||||
SERIALIZED_VERSION = "2.0".freeze
|
|
||||||
|
|
||||||
def initialize(user)
|
def initialize(user)
|
||||||
@user = user
|
@user = user
|
||||||
|
|
@ -26,5 +24,4 @@ module Diaspora
|
||||||
.merge(Export::OthersDataSerializer.new(@user).as_json)
|
.merge(Export::OthersDataSerializer.new(@user).as_json)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue