diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-09-10 02:28:53 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-09-10 02:29:10 +0300 |
| commit | af0b1c55e388af3277ea9339cd56b5da1220226f (patch) | |
| tree | 2271ac45b3220602e5a1bc12180784fb437ff471 | |
| parent | ae4cbb18f7a05859698deb4f63fc769ea1dcf6a5 (diff) | |
| parent | 66a0994c91cb22fb7137aec173c38e136c14b6b9 (diff) | |
Merge pull request #8389 from SuperTux88/update-changelog
Update next major to 1.0.0
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rw-r--r-- | config/defaults.yml | 2 | ||||
| -rw-r--r-- | config/load_config.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Changelog.md b/Changelog.md index 2d23759b6..9afe0dcd6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -# 0.8.0.0 +# 1.0.0 (unreleased) ## New configuration file! @@ -6,7 +6,7 @@ We already recommended you to move to our new TOML based configuration file. Wit ## API! -With the release of diaspora\* Version 0.8.0.0, we now officially support building applications on top of the diaspora\* API! Please check out [the official API documentation](https://diaspora.github.io/api-documentation/) for instructions, and please do file bugs if you notice something that could be improved! +With the release of diaspora\* Version 1.0, we now officially support building applications on top of the diaspora\* API! Please check out [the official API documentation](https://diaspora.github.io/api-documentation/) for instructions, and please do file bugs if you notice something that could be improved! We are looking forward to seeing many creative applications! diff --git a/config/defaults.yml b/config/defaults.yml index 9680f358c..901b45dc8 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.7.99.0" # Do not touch unless doing a release, do not backport the version number that's in master + number: "1.0.0-dev" # Do not touch unless doing a release, do not backport the version number that's in master heroku: false environment: url: "http://localhost:3000/" diff --git a/config/load_config.rb b/config/load_config.rb index 550d72103..f5d5757aa 100644 --- a/config/load_config.rb +++ b/config/load_config.rb @@ -42,7 +42,7 @@ AppConfig ||= Configurate::Settings.create do File.join(config_dir, "diaspora.toml"), namespace: "configuration", required: false else - warn "WARNING: diaspora.yml is deprecated and will no longer be read in diaspora 0.9." + warn "WARNING: diaspora.yml is deprecated and will no longer be read in diaspora 2.0." warn " Please copy over diaspora.toml.example to diaspora.toml and migrate your settings from diaspora.yml." add_provider Configurate::Provider::YAML, |