diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-12-17 19:58:00 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-12-18 11:18:21 -0200 |
| commit | ee425c9cf85e1cde3d284ebfcb5ce7328a37e8c1 (patch) | |
| tree | 0a8fccc60d183de5bb81a8a741ee61d8da5a27c3 /app/models | |
| parent | aa2c729e8e90968419d59281c0e6021f77877060 (diff) | |
| download | gitlab-ce-ee425c9cf85e1cde3d284ebfcb5ce7328a37e8c1.tar.gz | |
Remove feature flag for suggest changes feature
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 3 | ||||
| -rw-r--r-- | app/models/suggestion.rb | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8052a54c504..84cb581d437 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 diff --git a/app/models/suggestion.rb b/app/models/suggestion.rb index cec5ea30f9d..c76b8e71507 100644 --- a/app/models/suggestion.rb +++ b/app/models/suggestion.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class Suggestion < ApplicationRecord - FEATURE_FLAG = :diff_suggestions - belongs_to :note, inverse_of: :suggestions validates :note, presence: true validates :commit_id, presence: true, if: :applied? @@ -10,10 +8,6 @@ class Suggestion < ApplicationRecord delegate :original_position, :position, :diff_file, :noteable, to: :note - def self.feature_enabled? - Feature.enabled?(FEATURE_FLAG) - end - def project noteable.source_project end |