Skip to content
Snippets Groups Projects
Commit bca528a5 authored by Hiroyuki Sato's avatar Hiroyuki Sato
Browse files

Better title format for wiki page

The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
parent 03472b4f
No related branches found
No related tags found
1 merge request!6731Better title format for wiki page
Loading
Loading
@@ -47,7 +47,11 @@ class WikiPage
 
# The formatted title of this page.
def title
@attributes[:title] || ""
if @attributes[:title]
@attributes[:title].gsub(/-+/, ' ')
else
""
end
end
 
# Sets the title of this page.
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
= render 'main_links'
%h3.page-title
Editing -
%span.light #{@page.title.titleize}
%span.light #{@page.title}
%hr
= render 'form'
 
Loading
Loading
= render 'nav'
%h3.page-title
%span.light History for
= link_to @page.title.titleize, project_wiki_path(@project, @page)
= link_to @page.title, project_wiki_path(@project, @page)
 
%table.table
%thead
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@
- @wiki_pages.each do |wiki_page|
%li
%h4
= link_to wiki_page.title.titleize, project_wiki_path(@project, wiki_page)
= link_to wiki_page.title, project_wiki_path(@project, wiki_page)
%small (#{wiki_page.format})
.pull-right
%small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}
= render 'nav'
%h3.page-title
= @page.title.titleize
= @page.title
= render 'main_links'
- if @page.historical?
.warning_message
Loading
Loading
Loading
Loading
@@ -83,7 +83,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
 
Then 'I should see the existing page in the pages list' do
page.should have_content current_user.name
page.should have_content @page.title.titleize
page.should have_content @page.title
end
 
def wiki
Loading
Loading
Loading
Loading
@@ -155,4 +155,20 @@ describe WikiPage do
end
end
 
describe "#title" do
before do
create_page("Title", "content")
@page = wiki.find_page("Title")
end
after do
destroy_page("Title")
end
it "should be replace a hyphen to a space" do
@page.title = "Import-existing-repositories-into-GitLab"
@page.title.should == "Import existing repositories into GitLab"
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment