Non-interactive AWS install by running a single script.
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
This commit is contained in:
parent
eae41ad1df
commit
b80dd3d242
215 changed files with 3829 additions and 3348 deletions
|
@ -87,7 +87,7 @@ describe "Admin::Projects" do
|
|||
visit new_admin_project_path
|
||||
fill_in 'project_name', with: 'NewProject'
|
||||
fill_in 'project_code', with: 'NPR'
|
||||
fill_in 'project_path', with: 'gitlabhq_1'
|
||||
fill_in 'project_path', with: 'newproject'
|
||||
expect { click_button "Create project" }.to change { Project.count }.by(1)
|
||||
@project = Project.last
|
||||
end
|
||||
|
|
|
@ -2,20 +2,26 @@ require 'spec_helper'
|
|||
|
||||
describe "Admin::Projects" do
|
||||
describe "GET /admin/projects" do
|
||||
it { admin_projects_path.should be_allowed_for :admin }
|
||||
it { admin_projects_path.should be_denied_for :user }
|
||||
it { admin_projects_path.should be_denied_for :visitor }
|
||||
subject { admin_projects_path }
|
||||
|
||||
it { should be_allowed_for :admin }
|
||||
it { should be_denied_for :user }
|
||||
it { should be_denied_for :visitor }
|
||||
end
|
||||
|
||||
describe "GET /admin/users" do
|
||||
it { admin_users_path.should be_allowed_for :admin }
|
||||
it { admin_users_path.should be_denied_for :user }
|
||||
it { admin_users_path.should be_denied_for :visitor }
|
||||
subject { admin_users_path }
|
||||
|
||||
it { should be_allowed_for :admin }
|
||||
it { should be_denied_for :user }
|
||||
it { should be_denied_for :visitor }
|
||||
end
|
||||
|
||||
describe "GET /admin/hooks" do
|
||||
it { admin_hooks_path.should be_allowed_for :admin }
|
||||
it { admin_hooks_path.should be_denied_for :user }
|
||||
it { admin_hooks_path.should be_denied_for :visitor }
|
||||
subject { admin_hooks_path }
|
||||
|
||||
it { should be_allowed_for :admin }
|
||||
it { should be_denied_for :user }
|
||||
it { should be_denied_for :visitor }
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue