Skip to content
Snippets Groups Projects
Commit a63bce1a authored by Mark Chao's avatar Mark Chao Committed by Dmitriy Zaporozhets
Browse files

Resolve "Rename the `Master` role to `Maintainer`" Backend

parent 1bf54e09
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Showing
with 43 additions and 43 deletions
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::AvatarsController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
controller.instance_variable_set(:@project, project)
end
 
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::BadgesController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe Projects::BlameController do
before do
sign_in(user)
 
project.add_master(user)
project.add_maintainer(user)
controller.instance_variable_set(:@project, project)
end
 
Loading
Loading
Loading
Loading
@@ -108,7 +108,7 @@ describe Projects::BlobController do
end
 
before do
project.add_master(user)
project.add_maintainer(user)
 
sign_in(user)
end
Loading
Loading
@@ -230,12 +230,12 @@ describe Projects::BlobController do
end
end
 
context 'as master' do
let(:master) { create(:user) }
context 'as maintainer' do
let(:maintainer) { create(:user) }
 
before do
project.add_master(master)
sign_in(master)
project.add_maintainer(maintainer)
sign_in(maintainer)
get :edit, default_params
end
 
Loading
Loading
@@ -263,7 +263,7 @@ describe Projects::BlobController do
end
 
before do
project.add_master(user)
project.add_maintainer(user)
 
sign_in(user)
end
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ describe Projects::BoardsController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::BranchesController do
let(:developer) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
project.add_developer(user)
 
allow(project).to receive(:branches).and_return(['master', 'foo/bar/baz'])
Loading
Loading
Loading
Loading
@@ -17,7 +17,7 @@ describe Projects::Clusters::ApplicationsController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -70,7 +70,7 @@ describe Projects::Clusters::ApplicationsController do
 
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -61,7 +61,7 @@ describe Projects::ClustersController do
 
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -79,7 +79,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -142,7 +142,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -156,7 +156,7 @@ describe Projects::ClustersController do
describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -185,7 +185,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -236,7 +236,7 @@ describe Projects::ClustersController do
 
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -267,7 +267,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -286,7 +286,7 @@ describe Projects::ClustersController do
describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -306,7 +306,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -327,7 +327,7 @@ describe Projects::ClustersController do
describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -350,7 +350,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -365,7 +365,7 @@ describe Projects::ClustersController do
describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -386,7 +386,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -437,7 +437,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -525,7 +525,7 @@ describe Projects::ClustersController do
 
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
@@ -552,7 +552,7 @@ describe Projects::ClustersController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
@@ -605,7 +605,7 @@ describe Projects::ClustersController do
 
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_allowed_for(:maintainer).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ describe Projects::CommitController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe 'GET show' do
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::CommitsController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe "GET show" do
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::CompareController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe 'GET index' do
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::CycleAnalyticsController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe 'cycle analytics not set up flag' do
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ describe Projects::DeployKeysController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
 
sign_in(user)
end
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ describe Projects::DeploymentsController do
let(:environment) { create(:environment, name: 'production', project: project) }
 
before do
project.add_master(user)
project.add_maintainer(user)
 
sign_in(user)
end
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ describe Projects::EnvironmentsController do
end
 
before do
project.add_master(user)
project.add_maintainer(user)
 
sign_in(user)
end
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe Projects::FindFileController do
before do
sign_in(user)
 
project.add_master(user)
project.add_maintainer(user)
controller.instance_variable_set(:@project, project)
end
 
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::GraphsController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe 'GET languages' do
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe Projects::GroupLinksController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ describe Projects::HooksController do
let(:user) { create(:user) }
 
before do
project.add_master(user)
project.add_maintainer(user)
sign_in(user)
end
 
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe Projects::ImportsController do
 
before do
sign_in(user)
project.add_master(user)
project.add_maintainer(user)
end
 
describe 'GET #show' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment