diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 15:08:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 15:08:38 +0000 |
| commit | 16dbaf57bc4d87aa8a2bca8bf9db7cab26d841c4 (patch) | |
| tree | f5c6a87c9fbc0677c965d07b85a305cb2cb0fcc7 /app/helpers/merge_requests_helper.rb | |
| parent | 3e68d3848770b492d314f8e2967c37f7fdd5d143 (diff) | |
| download | gitlab-ce-16dbaf57bc4d87aa8a2bca8bf9db7cab26d841c4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 84a3802c72c..92855c444b4 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -203,9 +203,7 @@ module MergeRequestsHelper end def award_emoji_merge_request_api_path(merge_request) - if Feature.enabled?(:improved_emoji_picker, merge_request.project, default_enabled: :yaml) - api_v4_projects_merge_requests_award_emoji_path(id: merge_request.project.id, merge_request_iid: merge_request.iid) - end + api_v4_projects_merge_requests_award_emoji_path(id: merge_request.project.id, merge_request_iid: merge_request.iid) end private |