shipit-engine 0.32.0 → 0.33.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (176) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/magic-solid.svg +1 -0
  3. data/app/assets/javascripts/shipit/repositories_search.js.coffee +60 -0
  4. data/app/assets/javascripts/shipit/{search.js.coffee → stack_search.js.coffee} +0 -0
  5. data/app/assets/stylesheets/_pages/_repositories.scss +148 -0
  6. data/app/assets/stylesheets/_pages/_stacks.scss +19 -0
  7. data/app/assets/stylesheets/shipit.scss +1 -0
  8. data/app/controllers/shipit/api/{pull_requests_controller.rb → merge_requests_controller.rb} +8 -8
  9. data/app/controllers/shipit/api/stacks_controller.rb +14 -1
  10. data/app/controllers/shipit/deploys_controller.rb +2 -2
  11. data/app/controllers/shipit/merge_requests_controller.rb +31 -0
  12. data/app/controllers/shipit/merge_status_controller.rb +15 -15
  13. data/app/controllers/shipit/repositories_controller.rb +74 -0
  14. data/app/controllers/shipit/tasks_controller.rb +4 -4
  15. data/app/helpers/shipit/chunks_helper.rb +2 -2
  16. data/app/helpers/shipit/github_url_helper.rb +8 -0
  17. data/app/helpers/shipit/stacks_helper.rb +4 -0
  18. data/app/jobs/shipit/create_on_github_job.rb +1 -0
  19. data/app/jobs/shipit/destroy_repository_job.rb +24 -0
  20. data/app/jobs/shipit/destroy_stack_job.rb +2 -2
  21. data/app/jobs/shipit/perform_task_job.rb +4 -98
  22. data/app/jobs/shipit/process_merge_requests_job.rb +32 -0
  23. data/app/jobs/shipit/refresh_merge_request_job.rb +11 -0
  24. data/app/models/shipit/anonymous_user.rb +4 -0
  25. data/app/models/shipit/check_run.rb +2 -2
  26. data/app/models/shipit/command_line_user.rb +4 -0
  27. data/app/models/shipit/commit.rb +11 -11
  28. data/app/models/shipit/commit_checks.rb +1 -0
  29. data/app/models/shipit/deploy.rb +1 -0
  30. data/app/models/shipit/deploy_spec.rb +16 -4
  31. data/app/models/shipit/deploy_spec/file_system.rb +11 -5
  32. data/app/models/shipit/hook.rb +2 -0
  33. data/app/models/shipit/merge_request.rb +302 -0
  34. data/app/models/shipit/provisioning_handler.rb +32 -0
  35. data/app/models/shipit/provisioning_handler/base.rb +30 -0
  36. data/app/models/shipit/provisioning_handler/unregistered_provisioning_handler.rb +35 -0
  37. data/app/models/shipit/pull_request.rb +25 -264
  38. data/app/models/shipit/pull_request_assignment.rb +10 -0
  39. data/app/models/shipit/repository.rb +54 -0
  40. data/app/models/shipit/review_stack.rb +116 -0
  41. data/app/models/shipit/review_stack_provisioning_queue.rb +39 -0
  42. data/app/models/shipit/stack.rb +22 -8
  43. data/app/models/shipit/task.rb +56 -7
  44. data/app/models/shipit/task_execution_strategy/base.rb +20 -0
  45. data/app/models/shipit/task_execution_strategy/default.rb +110 -0
  46. data/app/models/shipit/user.rb +6 -1
  47. data/app/models/shipit/webhooks.rb +10 -0
  48. data/app/models/shipit/webhooks/handlers/pull_request/assigned_handler.rb +74 -0
  49. data/app/models/shipit/webhooks/handlers/pull_request/closed_handler.rb +68 -0
  50. data/app/models/shipit/webhooks/handlers/pull_request/edited_handler.rb +74 -0
  51. data/app/models/shipit/webhooks/handlers/pull_request/label_capturing_handler.rb +127 -0
  52. data/app/models/shipit/webhooks/handlers/pull_request/labeled_handler.rb +106 -0
  53. data/app/models/shipit/webhooks/handlers/pull_request/opened_handler.rb +83 -0
  54. data/app/models/shipit/webhooks/handlers/pull_request/reopened_handler.rb +88 -0
  55. data/app/models/shipit/webhooks/handlers/pull_request/review_stack_adapter.rb +103 -0
  56. data/app/models/shipit/webhooks/handlers/pull_request/unlabeled_handler.rb +107 -0
  57. data/app/serializers/shipit/deploy_serializer.rb +6 -0
  58. data/app/serializers/shipit/merge_request_serializer.rb +21 -0
  59. data/app/serializers/shipit/pull_request_serializer.rb +5 -8
  60. data/app/serializers/shipit/review_stack_serializer.rb +7 -0
  61. data/app/serializers/shipit/stack_serializer.rb +7 -6
  62. data/app/serializers/shipit/tail_task_serializer.rb +10 -2
  63. data/app/serializers/shipit/task_serializer.rb +1 -1
  64. data/app/views/shipit/merge_requests/_merge_request.html.erb +29 -0
  65. data/app/views/shipit/{pull_requests → merge_requests}/index.html.erb +2 -2
  66. data/app/views/shipit/merge_requests/merge_requests/_pull_request.html.erb +29 -0
  67. data/app/views/shipit/merge_requests/merge_requests/index.html.erb +20 -0
  68. data/app/views/shipit/merge_status/_merge_queue_button.html.erb +3 -3
  69. data/app/views/shipit/merge_status/backlogged.html.erb +1 -1
  70. data/app/views/shipit/merge_status/failure.html.erb +1 -1
  71. data/app/views/shipit/merge_status/locked.html.erb +1 -1
  72. data/app/views/shipit/merge_status/success.html.erb +2 -2
  73. data/app/views/shipit/repositories/_header.html.erb +19 -0
  74. data/app/views/shipit/repositories/index.html.erb +31 -0
  75. data/app/views/shipit/repositories/new.html.erb +23 -0
  76. data/app/views/shipit/repositories/settings.html.erb +53 -0
  77. data/app/views/shipit/repositories/show.html.erb +30 -0
  78. data/app/views/shipit/stacks/_banners.html.erb +13 -0
  79. data/app/views/shipit/stacks/_header.html.erb +5 -2
  80. data/app/views/shipit/stacks/_stack.html.erb +8 -0
  81. data/app/views/shipit/stacks/index.html.erb +2 -1
  82. data/app/views/shipit/stacks/settings.html.erb +5 -5
  83. data/app/views/shipit/stacks/show.html.erb +1 -1
  84. data/app/views/shipit/tasks/_task_output.html.erb +1 -1
  85. data/config/routes.rb +15 -5
  86. data/db/migrate/20200706145406_add_review_stacks.rb +12 -0
  87. data/db/migrate/20200804144639_rename_pull_request_to_merge_request.rb +7 -0
  88. data/db/migrate/20200804161512_rename_commits_pull_request_id_to_merge_request_id.rb +5 -0
  89. data/db/migrate/20200813134712_recreate_shipit_pull_requests.rb +22 -0
  90. data/db/migrate/20200813194056_create_pull_request_assignments.rb +8 -0
  91. data/db/migrate/20201001125502_add_provision_pr_stacks_flag_to_repositories.rb +7 -0
  92. data/db/migrate/20201008145809_add_retry_attempt_to_tasks.rb +5 -0
  93. data/db/migrate/20201008152744_add_max_retries_to_tasks.rb +5 -0
  94. data/lib/shipit.rb +11 -1
  95. data/lib/shipit/github_app.rb +1 -1
  96. data/lib/shipit/review_stack_commands.rb +8 -0
  97. data/lib/shipit/stack_commands.rb +6 -1
  98. data/lib/shipit/task_commands.rb +1 -0
  99. data/lib/shipit/version.rb +1 -1
  100. data/lib/tasks/cron.rake +11 -2
  101. data/test/controllers/api/{pull_requests_controller_test.rb → merge_requests_controller_test.rb} +12 -12
  102. data/test/controllers/api/outputs_controller_test.rb +1 -0
  103. data/test/controllers/api/rollback_controller_test.rb +1 -1
  104. data/test/controllers/api/stacks_controller_test.rb +21 -1
  105. data/test/controllers/{pull_requests_controller_test.rb → merge_requests_controller_test.rb} +6 -6
  106. data/test/controllers/repositories_controller_test.rb +71 -0
  107. data/test/controllers/stacks_controller_test.rb +9 -1
  108. data/test/controllers/tasks_controller_test.rb +14 -2
  109. data/test/controllers/webhooks_controller_test.rb +1 -1
  110. data/test/dummy/config/application.rb +6 -1
  111. data/test/dummy/config/environments/development.rb +0 -3
  112. data/test/dummy/config/environments/test.rb +0 -5
  113. data/test/dummy/db/schema.rb +52 -14
  114. data/test/dummy/db/seeds.rb +1 -1
  115. data/test/fixtures/payloads/check_suite_master.json +2 -2
  116. data/test/fixtures/payloads/invalid_pull_request.json +117 -0
  117. data/test/fixtures/payloads/provision_disabled_pull_request.json +454 -0
  118. data/test/fixtures/payloads/pull_request_assigned.json +480 -0
  119. data/test/fixtures/payloads/pull_request_closed.json +454 -0
  120. data/test/fixtures/payloads/pull_request_labeled.json +461 -0
  121. data/test/fixtures/payloads/pull_request_opened.json +454 -0
  122. data/test/fixtures/payloads/pull_request_reopened.json +454 -0
  123. data/test/fixtures/payloads/pull_request_unlabeled.json +454 -0
  124. data/test/fixtures/payloads/pull_request_with_no_repo.json +454 -0
  125. data/test/fixtures/shipit/commits.yml +15 -2
  126. data/test/fixtures/shipit/merge_requests.yml +141 -0
  127. data/test/fixtures/shipit/pull_request_assignments.yml +3 -0
  128. data/test/fixtures/shipit/pull_requests.yml +10 -131
  129. data/test/fixtures/shipit/repositories.yml +1 -0
  130. data/test/fixtures/shipit/stacks.yml +145 -0
  131. data/test/fixtures/shipit/statuses.yml +9 -0
  132. data/test/fixtures/shipit/tasks.yml +3 -0
  133. data/test/fixtures/shipit/users.yml +7 -0
  134. data/test/helpers/payloads_helper.rb +4 -0
  135. data/test/jobs/chunk_rollup_job_test.rb +15 -1
  136. data/test/jobs/destroy_repository_job_test.rb +27 -0
  137. data/test/jobs/perform_task_job_test.rb +8 -8
  138. data/test/jobs/{merge_pull_requests_job_test.rb → process_merge_requests_job_test.rb} +18 -18
  139. data/test/lib/shipit/deploy_commands_test.rb +16 -0
  140. data/test/lib/shipit/task_commands_test.rb +17 -0
  141. data/test/models/commits_test.rb +22 -13
  142. data/test/models/deploy_spec_test.rb +57 -24
  143. data/test/models/deploys_test.rb +148 -14
  144. data/test/models/{pull_request_test.rb → merge_request_test.rb} +30 -30
  145. data/test/models/pull_request_assignment_test.rb +16 -0
  146. data/test/models/shipit/provisioning_handler/base_test.rb +33 -0
  147. data/test/models/shipit/provisioning_handler/unregistered_provisioning_handler_test.rb +49 -0
  148. data/test/models/shipit/provisioning_handler_test.rb +64 -0
  149. data/test/models/shipit/pull_request_test.rb +52 -0
  150. data/test/models/shipit/repository_test.rb +5 -1
  151. data/test/models/shipit/review_stack_provision_status_test.rb +77 -0
  152. data/test/models/shipit/review_stack_provisioning_queue_test.rb +63 -0
  153. data/test/models/shipit/review_stack_test.rb +59 -0
  154. data/test/models/{stacks_test.rb → shipit/stacks_test.rb} +10 -4
  155. data/test/models/shipit/webhooks/handlers/pull_request/assigned_handler_test.rb +45 -0
  156. data/test/models/shipit/webhooks/handlers/pull_request/closed_handler_test.rb +192 -0
  157. data/test/models/shipit/webhooks/handlers/pull_request/edited_handler_test.rb +47 -0
  158. data/test/models/shipit/webhooks/handlers/pull_request/label_capturing_handler_test.rb +209 -0
  159. data/test/models/shipit/webhooks/handlers/pull_request/labeled_handler_test.rb +332 -0
  160. data/test/models/shipit/webhooks/handlers/pull_request/opened_handler_test.rb +238 -0
  161. data/test/models/shipit/webhooks/handlers/pull_request/reopened_handler_test.rb +282 -0
  162. data/test/models/shipit/webhooks/handlers/pull_request/review_stack_adapter_test.rb +83 -0
  163. data/test/models/shipit/webhooks/handlers/pull_request/unlabeled_handler_test.rb +324 -0
  164. data/test/models/shipit/{wehbooks → webhooks}/handlers_test.rb +0 -0
  165. data/test/models/tasks_test.rb +44 -3
  166. data/test/serializers/shipit/pull_request_serializer_test.rb +29 -0
  167. data/test/unit/command_test.rb +3 -3
  168. data/test/unit/github_url_helper_test.rb +5 -0
  169. data/test/unit/shipit_task_execution_strategy_test.rb +47 -0
  170. metadata +260 -154
  171. data/app/controllers/shipit/pull_requests_controller.rb +0 -31
  172. data/app/jobs/shipit/merge_pull_requests_job.rb +0 -32
  173. data/app/jobs/shipit/refresh_pull_request_job.rb +0 -11
  174. data/app/views/shipit/pull_requests/_pull_request.html.erb +0 -29
  175. data/test/fixtures/shipit/output_chunks.yml +0 -47
  176. data/test/models/output_chunk_test.rb +0 -21
@@ -0,0 +1,83 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shipit
4
+ module Webhooks
5
+ module Handlers
6
+ module PullRequest
7
+ class OpenedHandler < Shipit::Webhooks::Handlers::Handler
8
+ params do
9
+ requires :action, String
10
+ requires :number, Integer
11
+ requires :pull_request do
12
+ requires :id, Integer
13
+ requires :number, Integer
14
+ requires :url, String
15
+ requires :title, String
16
+ requires :state, String
17
+ requires :additions, Integer
18
+ requires :deletions, Integer
19
+ requires :head do
20
+ requires :sha, String
21
+ requires :ref, String
22
+ end
23
+ requires :user do
24
+ requires :login, String
25
+ end
26
+ requires :assignees, Array do
27
+ requires :login, String
28
+ end
29
+ requires :labels, Array do
30
+ requires :name, String
31
+ end
32
+ end
33
+ requires :repository do
34
+ requires :full_name, String
35
+ end
36
+ requires :sender do
37
+ requires :login, String
38
+ end
39
+ end
40
+
41
+ def process
42
+ return unless respond_to_pull_request_opened?
43
+
44
+ Shipit::Webhooks::Handlers::PullRequest::ReviewStackAdapter
45
+ .new(params, scope: repository.review_stacks).find_or_create!
46
+ end
47
+
48
+ private
49
+
50
+ def repository
51
+ @repository ||=
52
+ Shipit::Repository.from_github_repo_name(params.repository.full_name) ||
53
+ Shipit::NullRepository.new
54
+ end
55
+
56
+ def pull_request
57
+ params.pull_request
58
+ end
59
+
60
+ def respond_to_pull_request_opened?
61
+ params.action == "opened" &&
62
+ provision?
63
+ end
64
+
65
+ def provision?
66
+ repository.review_stacks_enabled &&
67
+ repository.provisioning_behavior_allow_all? ||
68
+ (repository.provisioning_behavior_allow_with_label? && pull_request_has_provisioning_label?) ||
69
+ (repository.provisioning_behavior_prevent_with_label? && !pull_request_has_provisioning_label?)
70
+ end
71
+
72
+ def pull_request_has_provisioning_label?
73
+ pull_request_label_names.include?(repository.provisioning_label_name)
74
+ end
75
+
76
+ def pull_request_label_names
77
+ Array.new(pull_request["labels"]).map { |label| label["name"] }
78
+ end
79
+ end
80
+ end
81
+ end
82
+ end
83
+ end
@@ -0,0 +1,88 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shipit
4
+ module Webhooks
5
+ module Handlers
6
+ module PullRequest
7
+ class ReopenedHandler < Shipit::Webhooks::Handlers::Handler
8
+ params do
9
+ requires :action, String
10
+ requires :number, Integer
11
+ requires :pull_request do
12
+ requires :id, Integer
13
+ requires :number, Integer
14
+ requires :url, String
15
+ requires :title, String
16
+ requires :state, String
17
+ requires :additions, Integer
18
+ requires :deletions, Integer
19
+ requires :head do
20
+ requires :sha, String
21
+ requires :ref, String
22
+ end
23
+ requires :user do
24
+ requires :login, String
25
+ end
26
+ requires :assignees, Array do
27
+ requires :login, String
28
+ end
29
+ requires :labels, Array do
30
+ requires :name, String
31
+ end
32
+ end
33
+ requires :repository do
34
+ requires :full_name, String
35
+ end
36
+ requires :sender do
37
+ requires :login, String
38
+ end
39
+ end
40
+
41
+ def process
42
+ return unless respond_to_pull_request_reopened?
43
+
44
+ stack.unarchive!
45
+ end
46
+
47
+ private
48
+
49
+ def repository
50
+ @repository ||=
51
+ Shipit::Repository.from_github_repo_name(params.repository.full_name) ||
52
+ Shipit::NullRepository.new
53
+ end
54
+
55
+ def stack
56
+ @stack ||=
57
+ Shipit::Webhooks::Handlers::PullRequest::ReviewStackAdapter
58
+ .new(params, scope: repository.review_stacks)
59
+ end
60
+
61
+ def pull_request
62
+ params.pull_request
63
+ end
64
+
65
+ def respond_to_pull_request_reopened?
66
+ params.action == "reopened" &&
67
+ unarchive?
68
+ end
69
+
70
+ def unarchive?
71
+ repository.review_stacks_enabled &&
72
+ repository.provisioning_behavior_allow_all? ||
73
+ (repository.provisioning_behavior_allow_with_label? && pull_request_has_provisioning_label?) ||
74
+ (repository.provisioning_behavior_prevent_with_label? && !pull_request_has_provisioning_label?)
75
+ end
76
+
77
+ def pull_request_has_provisioning_label?
78
+ pull_request_label_names.include?(repository.provisioning_label_name)
79
+ end
80
+
81
+ def pull_request_label_names
82
+ Array.new(pull_request["labels"]).map { |label| label["name"] }
83
+ end
84
+ end
85
+ end
86
+ end
87
+ end
88
+ end
@@ -0,0 +1,103 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shipit
4
+ module Webhooks
5
+ module Handlers
6
+ module PullRequest
7
+ class ReviewStackAdapter
8
+ delegate :archived?, to: :stack
9
+
10
+ def initialize(params, scope: Shipit::ReviewStack)
11
+ @params = params
12
+ @scope = scope
13
+ end
14
+
15
+ def stack
16
+ @stack ||= scope.find_by(environment: environment)
17
+ end
18
+
19
+ def find_or_create!
20
+ stack || create!
21
+ end
22
+
23
+ def archive!(*args, &block)
24
+ if stack.blank?
25
+ Rails.logger.info(
26
+ "Processing #{action} event for #{repo_name} PR #{pr_number} but no Stack exists. Ignoring."
27
+ )
28
+ return true
29
+ end
30
+ return if stack.archived?
31
+
32
+ stack.remove_from_provisioning_queue
33
+ stack.deprovision
34
+ stack.archive!(user, *args, &block)
35
+ end
36
+
37
+ def unarchive!(*args, &block)
38
+ if stack.blank?
39
+ Rails.logger.info(
40
+ "Processing #{action} event for #{repo_name} PR #{pr_number} but no ReviewStack exists. Creating."
41
+ )
42
+ return create!
43
+ end
44
+ return unless stack.archived?
45
+
46
+ stack.transaction do
47
+ stack.unarchive!(*args, &block)
48
+ Shipit::ReviewStackProvisioningQueue.add(stack)
49
+ end
50
+ end
51
+
52
+ def user
53
+ @user ||= Shipit::User.find_or_create_by_login!(params.sender["login"])
54
+ end
55
+
56
+ private
57
+
58
+ attr_reader :params, :scope
59
+
60
+ def action
61
+ params.action
62
+ end
63
+
64
+ def repo_name
65
+ params.repository["full_name"]
66
+ end
67
+
68
+ def pr_number
69
+ params.number
70
+ end
71
+
72
+ def create!
73
+ ReviewStack.transaction do
74
+ stack = scope.create!(stack_attributes)
75
+ stack
76
+ .build_pull_request
77
+ .update!(
78
+ github_pull_request: params.pull_request
79
+ )
80
+ end
81
+
82
+ Shipit::ReviewStackProvisioningQueue.add(stack)
83
+
84
+ @stack = stack
85
+ end
86
+
87
+ def stack_attributes
88
+ {
89
+ branch: params.pull_request.head.ref,
90
+ environment: environment,
91
+ ignore_ci: false,
92
+ continuous_deployment: false,
93
+ }
94
+ end
95
+
96
+ def environment
97
+ "pr#{params.number}"
98
+ end
99
+ end
100
+ end
101
+ end
102
+ end
103
+ end
@@ -0,0 +1,107 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shipit
4
+ module Webhooks
5
+ module Handlers
6
+ module PullRequest
7
+ class UnlabeledHandler < Shipit::Webhooks::Handlers::Handler
8
+ params do
9
+ requires :action, String
10
+ requires :number, Integer
11
+ requires :pull_request do
12
+ requires :id, Integer
13
+ requires :number, Integer
14
+ requires :url, String
15
+ requires :title, String
16
+ requires :state, String
17
+ requires :additions, Integer
18
+ requires :deletions, Integer
19
+ requires :head do
20
+ requires :sha, String
21
+ requires :ref, String
22
+ end
23
+ requires :user do
24
+ requires :login, String
25
+ end
26
+ requires :assignees, Array do
27
+ requires :login, String
28
+ end
29
+ requires :labels, Array do
30
+ requires :name, String
31
+ end
32
+ end
33
+ requires :repository do
34
+ requires :full_name, String
35
+ end
36
+ requires :sender do
37
+ requires :login, String
38
+ end
39
+ end
40
+
41
+ def process
42
+ return unless respond_to_label_change?
43
+
44
+ handle
45
+ end
46
+
47
+ private
48
+
49
+ def handle
50
+ if archive?
51
+ stack.archive!
52
+ elsif unarchive?
53
+ stack.unarchive!
54
+ end
55
+
56
+ stack
57
+ end
58
+
59
+ def repository
60
+ @repository ||=
61
+ Shipit::Repository.from_github_repo_name(params.repository.full_name) ||
62
+ Shipit::NullRepository.new
63
+ end
64
+
65
+ def stack
66
+ @stack ||=
67
+ Shipit::Webhooks::Handlers::PullRequest::ReviewStackAdapter
68
+ .new(params, scope: repository.review_stacks)
69
+ end
70
+
71
+ def pull_request
72
+ params.pull_request
73
+ end
74
+
75
+ def pull_request_state
76
+ pull_request["state"]
77
+ end
78
+
79
+ def respond_to_label_change?
80
+ params.action == "unlabeled" &&
81
+ pull_request_state == "open" &&
82
+ repository.review_stacks_enabled &&
83
+ (archive? || unarchive?)
84
+ end
85
+
86
+ def archive?
87
+ (repository.provisioning_behavior_allow_with_label? && !pull_request_has_provisioning_label?) ||
88
+ (repository.provisioning_behavior_prevent_with_label? && pull_request_has_provisioning_label?)
89
+ end
90
+
91
+ def unarchive?
92
+ (repository.provisioning_behavior_allow_with_label? && pull_request_has_provisioning_label?) ||
93
+ (repository.provisioning_behavior_prevent_with_label? && !pull_request_has_provisioning_label?)
94
+ end
95
+
96
+ def pull_request_has_provisioning_label?
97
+ pull_request_label_names.include?(repository.provisioning_label_name)
98
+ end
99
+
100
+ def pull_request_label_names
101
+ Array.new(pull_request.labels).map(&:name)
102
+ end
103
+ end
104
+ end
105
+ end
106
+ end
107
+ end
@@ -22,5 +22,11 @@ module Shipit
22
22
  def type
23
23
  :deploy
24
24
  end
25
+
26
+ def rollback_once_aborted_to
27
+ return nil unless object.rollback_once_aborted_to
28
+
29
+ DeploySerializer.new(object.rollback_once_aborted_to)
30
+ end
25
31
  end
26
32
  end
@@ -0,0 +1,21 @@
1
+ # frozen_string_literal: true
2
+ module Shipit
3
+ class MergeRequestSerializer < ActiveModel::Serializer
4
+ include GithubUrlHelper
5
+ include ConditionalAttributes
6
+
7
+ has_one :merge_requested_by
8
+ has_one :head, serializer: ShortCommitSerializer
9
+
10
+ attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
11
+ :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
12
+
13
+ def html_url
14
+ github_pull_request_url(object)
15
+ end
16
+
17
+ def include_rejection_reason?
18
+ object.rejection_reason?
19
+ end
20
+ end
21
+ end
@@ -1,21 +1,18 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Shipit
3
4
  class PullRequestSerializer < ActiveModel::Serializer
4
5
  include GithubUrlHelper
5
6
  include ConditionalAttributes
6
7
 
7
- has_one :merge_requested_by
8
+ has_one :user
8
9
  has_one :head, serializer: ShortCommitSerializer
10
+ has_many :assignees, serializer: UserSerializer
9
11
 
10
- attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
11
- :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
12
+ attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :html_url
12
13
 
13
14
  def html_url
14
- github_pull_request_url(object)
15
- end
16
-
17
- def include_rejection_reason?
18
- object.rejection_reason?
15
+ github_pull_request_url(object) if object.stack.present?
19
16
  end
20
17
  end
21
18
  end