diff --git a/Changelog.md b/Changelog.md index bfa2036f45b3fe510fcd95b7d5c49fc4e94aa066..b5a93efdbcfb3cc1a33abac4c33e6aa4db7780c8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,9 @@ +# Head + +## Features + +* Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980) + # 0.0.3.0 ## Refactor diff --git a/config/defaults.yml b/config/defaults.yml index a028aee0546055f450e7be2ea0f601081abcb028..9d311cec42ad1f67510a71e3e3f004150701a4eb 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,8 +4,7 @@ defaults: version: - number: "0.0.3.0" - release: false # Do not touch unless in a merge conflict on doing a release, master should have a commit setting this to true which is not backported to the develop branch. + number: "head" # Do not touch unless doing a release, do not backport the version number that's in master but keep develp to always say "head" heroku: false environment: url: "http://localhost:3000/" diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb index 6b58967caef3b1240d12fa1a92cbcab50edcd77c..095ca854f82fa9ad246f6da9777024bdb5070368 100644 --- a/lib/configuration_methods.rb +++ b/lib/configuration_methods.rb @@ -42,7 +42,6 @@ module Configuration def version_string return @version_string unless @version_string.nil? @version_string = version.number.to_s - @version_string << "pre" unless version.release? @version_string << "-p#{git_revision[0..7]}" if git_available? @version_string end @@ -54,6 +53,7 @@ module Configuration @git_available = false else `which git` + `git status 2> /dev/null` if $?.success? @git_available = $?.success? end end diff --git a/spec/lib/configuration_methods_spec.rb b/spec/lib/configuration_methods_spec.rb index 8cc3525d8d1e3b24fcdafae66195bfc40d35416d..34bbc70651d50a43e4eeb745cbbe11f308d18615 100644 --- a/spec/lib/configuration_methods_spec.rb +++ b/spec/lib/configuration_methods_spec.rb @@ -82,16 +82,6 @@ describe Configuration::Methods do @settings.version_string.should include @version.number end - context "on a non release" do - before do - @version.stub(:release?).and_return(false) - end - - it "includes pre" do - @settings.version_string.should include "pre" - end - end - context "with git available" do before do @settings.stub(:git_available?).and_return(true)