Skip to content
Extraits de code Groupes Projets
Valider ba9aee59 rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

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

parent 1f4787aa
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
# 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 # 0.0.3.0
## Refactor ## Refactor
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
defaults: defaults:
version: version:
number: "0.0.3.0" 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"
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.
heroku: false heroku: false
environment: environment:
url: "http://localhost:3000/" url: "http://localhost:3000/"
......
...@@ -42,7 +42,6 @@ module Configuration ...@@ -42,7 +42,6 @@ module Configuration
def version_string def version_string
return @version_string unless @version_string.nil? return @version_string unless @version_string.nil?
@version_string = version.number.to_s @version_string = version.number.to_s
@version_string << "pre" unless version.release?
@version_string << "-p#{git_revision[0..7]}" if git_available? @version_string << "-p#{git_revision[0..7]}" if git_available?
@version_string @version_string
end end
...@@ -54,6 +53,7 @@ module Configuration ...@@ -54,6 +53,7 @@ module Configuration
@git_available = false @git_available = false
else else
`which git` `which git`
`git status 2> /dev/null` if $?.success?
@git_available = $?.success? @git_available = $?.success?
end end
end end
......
...@@ -82,16 +82,6 @@ describe Configuration::Methods do ...@@ -82,16 +82,6 @@ describe Configuration::Methods do
@settings.version_string.should include @version.number @settings.version_string.should include @version.number
end 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 context "with git available" do
before do before do
@settings.stub(:git_available?).and_return(true) @settings.stub(:git_available?).and_return(true)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter