Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-09-21 03:05:53 +0300
committerMichael Kozono <mkozono@gmail.com>2019-09-21 03:22:24 +0300
commit537f0a318bf86cd138bc5cdbc9c6edb2c9eaf444 (patch)
tree4b176b37f495539006bca69bbffe078bf314f90c
parentf5d5a115ab0f715ec76ef3367258d3c4d216d3a2 (diff)
Remove deprecated code
This commit will go into GitLab 12.4. GitLab 12.2 depended on this deprecated code and was left in 12.3 since Gitaly gets upgraded before the Rails app.
-rw-r--r--ruby/gitlab-shell/lib/gitlab_post_receive.rb48
-rw-r--r--ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb108
2 files changed, 0 insertions, 156 deletions
diff --git a/ruby/gitlab-shell/lib/gitlab_post_receive.rb b/ruby/gitlab-shell/lib/gitlab_post_receive.rb
index 338354146..df70c49a2 100644
--- a/ruby/gitlab-shell/lib/gitlab_post_receive.rb
+++ b/ruby/gitlab-shell/lib/gitlab_post_receive.rb
@@ -27,9 +27,6 @@ class GitlabPostReceive
return false unless response
- # Deprecated message format for backwards-compatibility
- print_gitlab_12_2_messages(response)
-
print_messages(response['messages'])
response['reference_counter_decreased']
@@ -43,51 +40,6 @@ class GitlabPostReceive
@api ||= GitlabNet.new
end
- # Deprecated message format for backwards-compatibility
- def print_gitlab_12_2_messages(response)
- if response['broadcast_message']
- puts
- print_alert(response['broadcast_message'])
- end
-
- print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls']
- puts response['redirected_message'] if response['redirected_message']
- puts response['project_created_message'] if response['project_created_message']
-
- if response['warnings']
- puts
- print_warnings(response['warnings'])
- end
- end
-
- # Deprecated message format for backwards-compatibility
- def print_merge_request_links(merge_request_urls)
- return if merge_request_urls.empty?
- puts
- merge_request_urls.each { |mr| print_merge_request_link(mr) }
- end
-
- # Deprecated message format for backwards-compatibility
- def print_merge_request_link(merge_request)
- message =
- if merge_request["new_merge_request"]
- "To create a merge request for #{merge_request['branch_name']}, visit:"
- else
- "View merge request for #{merge_request['branch_name']}:"
- end
-
- puts message
- puts((" " * 2) + merge_request["url"])
- puts
- end
-
- # Deprecated message format for backwards-compatibility
- def print_warnings(warnings)
- message = "WARNINGS:\n#{warnings}"
- print_alert(message)
- puts
- end
-
def print_alert(message)
Message.new('alert', message).print(output_stream)
end
diff --git a/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb b/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
index b9a86f486..ca2d7fae9 100644
--- a/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
@@ -170,114 +170,6 @@ describe GitlabPostReceive do
expect(subject).to be true
end
end
-
- # Deprecated message format for backwards-compatibility
- context 'deprecated message format' do
- let(:new_merge_request_urls) do
- [{
- 'branch_name' => 'new_branch',
- 'url' => 'http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch',
- 'new_merge_request' => true
- }]
- end
-
- let(:response) do
- {
- 'merge_request_urls' => new_merge_request_urls,
- 'broadcast_message' => broadcast_message
- }
- end
-
- def assert_new_mr_printed
- expect_puts "To create a merge request for new_branch, visit:"
- expect_puts " http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
- expect_puts
- end
-
- it 'prints the merge request urls and broadcast message' do
- assert_broadcast_message_printed
- assert_new_mr_printed
-
- subject
- end
-
- context 'when contains long url string at end' do
- let(:broadcast_message) { "test " * 10 + "message " * 10 + "https://localhost:5000/test/a/really/long/url/that/is/in/the/broadcast/message/do-not-truncate-when-url" }
-
- it 'doesnt truncate url' do
- assert_broadcast_message_printed_keep_long_url_end
- assert_new_mr_printed
-
- subject
- end
- end
-
- context 'when contains long url string at start' do
- let(:broadcast_message) { "https://localhost:5000/test/a/really/long/url/that/is/in/the/broadcast/message/do-not-truncate-when-url " + "test " * 10 + "message " * 11}
-
- it 'doesnt truncate url' do
- assert_broadcast_message_printed_keep_long_url_start
- assert_new_mr_printed
-
- subject
- end
- end
-
- context 'when contains long url string in middle' do
- let(:broadcast_message) { "test " * 11 + "https://localhost:5000/test/a/really/long/url/that/is/in/the/broadcast/message/do-not-truncate-when-url " + "message " * 11}
-
- it 'doesnt truncate url' do
- assert_broadcast_message_printed_keep_long_url_middle
- assert_new_mr_printed
-
- subject
- end
- end
- end
-
- context 'when warnings are present' do
- let(:response) do
- {
- 'warnings' => 'My warning message'
- }
- end
-
- it 'treats the warning as a broadcast message' do
- assert_warning_looks_like_broadcast_message
-
- subject
- end
- end
-
- context 'when redirected message available' do
- let(:message) { "This is a redirected message" }
- let(:response) do
- {
- 'redirected_message' => message
- }
- end
-
- it 'prints redirected message' do
- expect_puts "This is a redirected message"
-
- subject
- end
-
- context 'when project created message is available' do
- let(:message) { "This is a created project message" }
- let(:response) do
- {
- 'project_created_message' => message
- }
- end
-
- it 'prints project created message' do
- expect_puts "This is a created project message"
-
- subject
- end
- end
- end
end
private