diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 15:16:26 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 15:16:26 -0500 |
| commit | c0220198d1fc880a092134a07901c52be4b3595b (patch) | |
| tree | ae74193a62f7ff585bb05dfbcf12e9fb826b55ce /app/models/merge_request.rb | |
| parent | 63363e47f4228e15585b0908d91c8749b1067d37 (diff) | |
| download | gitlab-ce-c0220198d1fc880a092134a07901c52be4b3595b.tar.gz | |
removing last chunk of MR ajax changes, rest will be in another MR
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b2cb86dc1e5..c63d0c01653 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -466,6 +466,16 @@ class MergeRequest < ActiveRecord::Base ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch) end + def state_human_name + if merged? + "Merged" + elsif closed? + "Closed" + else + "Open" + end + end + def target_sha @target_sha ||= target_project. repository.commit(target_branch).sha |