diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-27 17:28:17 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-03-13 20:33:35 +0800 |
commit | 6e3bb1e3888fa7db1afd4e9ff2239106c49d0e38 (patch) | |
tree | 10ef466ba1fd3c22fd67116eda14064965d2de34 | |
parent | 2de0bcf8007d9e92c9c691c1ec7664e5331300b3 (diff) | |
download | gitlab-ce-6e3bb1e3888fa7db1afd4e9ff2239106c49d0e38.tar.gz |
Remove NUMBER_OF_PERMITTED_BOARDS from Project
We already check max boards in the create service. This is not used.
-rw-r--r-- | app/models/project.rb | 14 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 9 |
2 files changed, 1 insertions, 22 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index aba63032cdf..3b5cb3770cf 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -38,7 +38,6 @@ class Project < ActiveRecord::Base BoardLimitExceeded = Class.new(StandardError) STATISTICS_ATTRIBUTE = 'repositories_count'.freeze - NUMBER_OF_PERMITTED_BOARDS = 1 UNKNOWN_IMPORT_URL = 'http://unknown.git'.freeze # Hashed Storage versions handle rolling out new storage to project and dependents models: # nil: legacy @@ -137,7 +136,7 @@ class Project < ActiveRecord::Base alias_attribute :parent_id, :namespace_id has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event' - has_many :boards, before_add: :validate_board_limit + has_many :boards # Project services has_one :campfire_service @@ -2194,17 +2193,6 @@ class Project < ActiveRecord::Base "projects/#{id}/pushes_since_gc" end - # Similar to the normal callbacks that hook into the life cycle of an - # Active Record object, you can also define callbacks that get triggered - # when you add an object to an association collection. If any of these - # callbacks throw an exception, the object will not be added to the - # collection. Before you add a new board to the boards collection if you - # already have 1, 2, or n it will fail, but it if you have 0 that is lower - # than the number of permitted boards per project it won't fail. - def validate_board_limit(board) - raise BoardLimitExceeded, 'Number of permitted boards exceeded' if boards.size >= NUMBER_OF_PERMITTED_BOARDS - end - def update_project_statistics stats = statistics || build_statistics stats.update(namespace_id: namespace_id) diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 5c09faafd83..328133e5c3c 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -136,15 +136,6 @@ describe Project do end end - describe '#boards' do - it 'raises an error when attempting to add more than one board to the project' do - subject.boards.build - - expect { subject.boards.build }.to raise_error(Project::BoardLimitExceeded, 'Number of permitted boards exceeded') - expect(subject.boards.size).to eq 1 - end - end - describe 'ci_pipelines association' do it 'returns only pipelines from ci_sources' do expect(Ci::Pipeline).to receive(:ci_sources).and_call_original |