update changelog; replace "pre" releases with a plain "head"

Conflicts:
	config/defaults.yml

Changelog.md

+# 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

config/defaults.yml

@@ -5,7 +5,6 @@
 defaults:
   version:
     number: "0.0.3.0"
-    release: true # 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.
   heroku: false
   environment:
     url: "http://localhost:3000/"

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

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)