summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-05-04 18:34:34 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-05-04 18:34:34 +0000
commit8be1118aa528dff6787fdab7fbde7261a012c418 (patch)
treef2dde6278893b881f45cc2b7eaa19610ed46299b
parent8aa29a5d736d2c0d195ea8de453743c00e33ce36 (diff)
parentc8187738a217166cbf03c26adc4a09fcf43a3b94 (diff)
downloadgitlab-ce-8be1118aa528dff6787fdab7fbde7261a012c418.tar.gz
Merge branch 'clean-user-profile-classes' into 'master'
Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
-rw-r--r--app/views/users/show.html.haml2
-rw-r--r--features/steps/user.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0dff27f9654..03511b0654f 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -98,7 +98,7 @@
#groups.tab-pane
- # This tab is always loaded via AJAX
- #contributed.contributed-projects.tab-pane
+ #contributed.tab-pane
- # This tab is always loaded via AJAX
#projects.tab-pane
diff --git a/features/steps/user.rb b/features/steps/user.rb
index 39bbb59343b..b1d088f07f9 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -28,7 +28,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
end
step 'I should see contributed projects' do
- page.within '.contributed-projects' do
+ page.within '#contributed' do
expect(page).to have_content(@contributed_project.name)
end
end