diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-18 15:42:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-18 15:42:34 +0000 |
| commit | 58ee1746a867ea939dd64a993963f14fc34c338d (patch) | |
| tree | d84fb41de2c37a647bc7e9edb0ee8d55b9a0e4a0 /app/models/merge_request.rb | |
| parent | 4e8450aff6125ba48e7460db59a6341c9d680ad7 (diff) | |
| parent | ee425c9cf85e1cde3d284ebfcb5ce7328a37e8c1 (diff) | |
| download | gitlab-ce-58ee1746a867ea939dd64a993963f14fc34c338d.tar.gz | |
Merge branch 'osw-revert-suggestions-ff' into 'master'
Remove feature flag for suggest changes feature
See merge request gitlab-org/gitlab-ce!23892
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6f5ea6e29ab..944b9f72396 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -364,8 +364,7 @@ class MergeRequest < ActiveRecord::Base end def supports_suggestion? - # Should be `true` when removing the FF. - Suggestion.feature_enabled? + true end # Calls `MergeWorker` to proceed with the merge process and |