Merge branch 'master' into buildbox-service

Conflicts:
	app/models/project.rb

3 files changed, 4 insertions, 4 deletions

diff --git a/features/snippets/discover.feature b/features/snippets/discover.feature
index f0b8d3a408a..5094062c8c3 100644
--- a/features/snippets/discover.feature
+++ b/features/snippets/discover.feature
@@ -1,5 +1,5 @@
 @snippets
-Feature: Discover Snippets
+Feature: Snippets Discover
   Background:
     Given I sign in as a user
     And I have public "Personal snippet one" snippet
diff --git a/features/snippets/snippets.feature b/features/snippets/snippets.feature
index 38216dd5b7b..4c4e3ee2cff 100644
--- a/features/snippets/snippets.feature
+++ b/features/snippets/snippets.feature
@@ -1,5 +1,5 @@
 @snippets
-Feature: Snippets Feature
+Feature: Snippets
   Background:
     Given I sign in as a user
     And I have public "Personal snippet one" snippet
diff --git a/features/snippets/user.feature b/features/snippets/user.feature
index d032a33686b..ae34e8e7ffa 100644
--- a/features/snippets/user.feature
+++ b/features/snippets/user.feature
@@ -1,5 +1,5 @@
 @snippets
-Feature: User Snippets
+Feature: Snippets User
   Background:
     Given I sign in as a user
     And I have public "Personal snippet one" snippet
@@ -18,6 +18,6 @@ Feature: User Snippets
 
   Scenario: I can see only my public snippets
     Given I visit my snippets page
-    And I click "Public" filter
+    And I click "Internal" filter
     Then I should see "Personal snippet one" in snippets
     And I should not see "Personal snippet private" in snippets