diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 00:11:30 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 00:11:30 +0300 |
commit | 05323a78555d7bc956e820c715e59877476fa3b3 (patch) | |
tree | cff0b509bf6988ced98a3d35adde28d323493255 /features | |
parent | c00ba9a632b894517d9d24d9f263712edba842a1 (diff) | |
parent | 10e3de7a454cc85bcf21902bb808dd1e0eec47ed (diff) |
Merge branch 'project-settings' into 'master'
Project settings UI update
![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)
See merge request !4162
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/shared/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index ea5f9580308..ce9ea7ee18a 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -95,7 +95,7 @@ module SharedProject step 'I should see project settings' do expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project) expect(page).to have_content("Project name") - expect(page).to have_content("Features:") + expect(page).to have_content("Features") end def current_project |