diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 21:14:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 21:14:27 +0000 |
| commit | 4f365066330365391c11eeb408e884c021465a00 (patch) | |
| tree | 9923c2235787f6a95582e3678d206b0118a75b13 | |
| parent | ffa1b67d2fe2ca00616837e477002142e8f6dcfa (diff) | |
| parent | 41dd01b1276d11ceec6d63e2ead52ddaf1852041 (diff) | |
| download | gitlab-ce-4f365066330365391c11eeb408e884c021465a00.tar.gz | |
Merge branch 'remove-your_email-gsub-in-help-page' into 'master'
Stop replacing `$your_email` with the user's email in the `/help` pages
See merge request !8014
| -rw-r--r-- | app/views/help/show.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/help_pages_spec.rb | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml index be257b51b9e..f6ebd76af9d 100644 --- a/app/views/help/show.html.haml +++ b/app/views/help/show.html.haml @@ -1,3 +1,3 @@ - page_title @path.split("/").reverse.map(&:humanize) .documentation.wiki - = markdown @markdown.gsub('$your_email', current_user.try(:email) || "email@example.com") + = markdown @markdown diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb index 4319d6db0d2..40a1fced8d8 100644 --- a/spec/features/help_pages_spec.rb +++ b/spec/features/help_pages_spec.rb @@ -1,16 +1,6 @@ require 'spec_helper' describe 'Help Pages', feature: true do - describe 'Show SSH page' do - before do - login_as :user - end - it 'replaces the variable $your_email with the email of the user' do - visit help_page_path('ssh/README') - expect(page).to have_content("ssh-keygen -t rsa -C \"#{@user.email}\"") - end - end - describe 'Get the main help page' do shared_examples_for 'help page' do |prefix: ''| it 'prefixes links correctly' do |