diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-15 12:09:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-15 12:09:26 +0000 |
| commit | 9215d9f7619929f9da16744fa37636635b66949b (patch) | |
| tree | 754fa5c3a99700176b117d96b30268cbd3c07581 /app/models/resource_state_event.rb | |
| parent | a898b6057ecf9ab635c45217568d44eab5c32ec0 (diff) | |
| download | gitlab-ce-9215d9f7619929f9da16744fa37636635b66949b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/resource_state_event.rb')
| -rw-r--r-- | app/models/resource_state_event.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/resource_state_event.rb b/app/models/resource_state_event.rb index 1d6573b180f..f8f7965a921 100644 --- a/app/models/resource_state_event.rb +++ b/app/models/resource_state_event.rb @@ -6,6 +6,8 @@ class ResourceStateEvent < ResourceEvent validate :exactly_one_issuable + belongs_to :source_merge_request, class_name: 'MergeRequest', foreign_key: :source_merge_request_id + # state is used for issue and merge request states. enum state: Issue.available_states.merge(MergeRequest.available_states).merge(reopened: 5) |