diff options
| author | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
|---|---|---|
| committer | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
| commit | 4c7da578f200f0bc721cc2cae27eb2b25f96e8dd (patch) | |
| tree | 565b5b7746bc2cff8e46883b4d1836dfaa0246ef /features/snippets/snippets.feature | |
| parent | 76594d474ca6d04c2e608e7b3df1229729288f14 (diff) | |
| parent | 928178deb9d582d7537a57983ff9e695f07dab1f (diff) | |
| download | gitlab-ce-4c7da578f200f0bc721cc2cae27eb2b25f96e8dd.tar.gz | |
Merge branch 'master' into buildbox-service
Conflicts:
app/models/project.rb
Diffstat (limited to 'features/snippets/snippets.feature')
| -rw-r--r-- | features/snippets/snippets.feature | 2 |
1 files changed, 1 insertions, 1 deletions
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 |