summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-02-06 16:50:44 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-02-06 17:51:15 +0000
commitd0dc169b3b34523233fe2586de0277def0ec1f67 (patch)
tree4e4b41b2442b6e9eb30d87d5c2ef2f5b29e9fd6c
parent51ea7adbd1007013f10fe3503ea4b1212ec9fd0a (diff)
downloadgitlab-shell-d0dc169b3b34523233fe2586de0277def0ec1f67.tar.gz
Adds changelog item and bumps the version
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--spec/gitlab_post_receive_spec.rb49
3 files changed, 8 insertions, 46 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6123299..0a5c8d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v6.0.3
+ - Print new project information in post-receive
+
v6.0.2
- Use grpc-go 1.9.1 (!184)
- Update gitaly-proto and gitaly libs (!185)
diff --git a/VERSION b/VERSION
index 9b9a244..090ea9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.2
+6.0.3
diff --git a/spec/gitlab_post_receive_spec.rb b/spec/gitlab_post_receive_spec.rb
index 3a5dd38..ec7e248 100644
--- a/spec/gitlab_post_receive_spec.rb
+++ b/spec/gitlab_post_receive_spec.rb
@@ -62,16 +62,7 @@ describe GitlabPostReceive do
end
context 'when redirected message available' do
- let(:message) do
- <<~MSG
- Project 'foo/bar' was moved to 'foo/baz'.
-
- Please update your Git remote:
-
- git remote set-url origin http://localhost:3000/foo/baz.git
- MSG
- end
-
+ let(:message) { "This is a redirected message" }
let(:response) do
{
'reference_counter_decreased' => true,
@@ -86,20 +77,7 @@ describe GitlabPostReceive do
end
context 'when project created message is available' do
- let(:message) do
- <<~MSG
-
- The private project foo/bar was successfully created.
-
- To configure the remote, run:
- git remote add origin http://localhost:3000/foo/bar.git
-
- To view the project, visit:
- http://localhost:3000/foo/bar
-
- MSG
- end
-
+ let(:message) { "This is a created project message" }
let(:response) do
{
'reference_counter_decreased' => true,
@@ -163,29 +141,10 @@ describe GitlabPostReceive do
end
def assert_redirected_message_printed(gitlab_post_receive)
- message = <<~MSG
- Project 'foo/bar' was moved to 'foo/baz'.
-
- Please update your Git remote:
-
- git remote set-url origin http://localhost:3000/foo/baz.git
- MSG
- expect(gitlab_post_receive).to receive(:puts).with(message).ordered
+ expect(gitlab_post_receive).to receive(:puts).with("This is a redirected message")
end
def assert_project_created_message_printed(gitlab_post_receive)
- message = <<~MSG
-
- The private project foo/bar was successfully created.
-
- To configure the remote, run:
- git remote add origin http://localhost:3000/foo/bar.git
-
- To view the project, visit:
- http://localhost:3000/foo/bar
-
- MSG
-
- expect(gitlab_post_receive).to receive(:puts).with(message).ordered
+ expect(gitlab_post_receive).to receive(:puts).with("This is a created project message")
end
end