From ce8b3c89dbc97809ebc950feaff9fe0a89bbd2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 18 Feb 2013 20:20:50 +0100 Subject: [PATCH] update changelog; replace "pre" releases with a plain "head" Conflicts: config/defaults.yml --- Changelog.md | 6 ++++++ config/defaults.yml | 1 - lib/configuration_methods.rb | 2 +- spec/lib/configuration_methods_spec.rb | 10 ---------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Changelog.md b/Changelog.md index bfa2036f4..b5a93efdb 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 bcfca2dfe..24565f316 100644 --- a/config/defaults.yml +++ b/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/" diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb index 6b58967ca..095ca854f 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 8cc3525d8..34bbc7065 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)