summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-11-17 15:09:22 +0000
committerRobert Speicher <robert@gitlab.com>2015-11-17 15:09:22 +0000
commitdf0110ba81a86b3e066c8b703e1c26d6d05a75da (patch)
treeffebbd5ff5812ebaccbed116319a413345a2f1ba /features
parent1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff)
parentc8e53d4467e1e8cce4db04aafba00d55f014e283 (diff)
downloadgitlab-ce-df0110ba81a86b3e066c8b703e1c26d6d05a75da.tar.gz
Merge branch 'rs-revert-gh-9820' into 'master'
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/issues/issues.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index be134b9c2bb..af2da41badb 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -219,7 +219,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step 'The code block should be unchanged' do
- expect(page).to have_content("Command [1]: /usr/local/bin/git , see [text](doc/text)")
+ expect(page).to have_content("```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```")
end
step 'project \'Shop\' has issue \'Bugfix1\' with description: \'Description for issue1\'' do