summaryrefslogtreecommitdiff
path: root/features/steps/snippets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 22:36:39 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 22:36:39 +0200
commitc8e1c53f43aa09c5e801cdcdc8f4b44576b34274 (patch)
treea1117aebab052fdd3783154327c79946459c8b71 /features/steps/snippets
parent3f2d94105b9671fc7ccfd5e18631e525f8a7015d (diff)
parent170340e6b15f91e79cf683c892ec887c3115b317 (diff)
downloadgitlab-ce-c8e1c53f43aa09c5e801cdcdc8f4b44576b34274.tar.gz
Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix
Diffstat (limited to 'features/steps/snippets')
-rw-r--r--features/steps/snippets/discover.rb (renamed from features/steps/snippets/discover_snippets.rb)0
-rw-r--r--features/steps/snippets/user.rb (renamed from features/steps/snippets/user_snippets.rb)0
2 files changed, 0 insertions, 0 deletions
diff --git a/features/steps/snippets/discover_snippets.rb b/features/steps/snippets/discover.rb
index 09337937002..09337937002 100644
--- a/features/steps/snippets/discover_snippets.rb
+++ b/features/steps/snippets/discover.rb
diff --git a/features/steps/snippets/user_snippets.rb b/features/steps/snippets/user.rb
index 2d7ffc866e7..2d7ffc866e7 100644
--- a/features/steps/snippets/user_snippets.rb
+++ b/features/steps/snippets/user.rb