diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 16:19:38 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 16:19:38 +0100 |
| commit | 0430c00cf02cc62a376545ae7333a06f78913aca (patch) | |
| tree | 2c27211eb46f276225b12b6ea5309883dc8bf0b3 /app/models/wiki_page.rb | |
| parent | fc9a2a3e70488d8b658f007756bc1299dd57991b (diff) | |
| parent | b6454fef568352b9fffc2c4cb194c98c4af2efa9 (diff) | |
| download | gitlab-ce-0430c00cf02cc62a376545ae7333a06f78913aca.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index e9413c34bae..2a65f0431c4 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -169,7 +169,7 @@ class WikiPage private def set_attributes - attributes[:slug] = @page.escaped_url_path + attributes[:slug] = @page.url_path attributes[:title] = @page.title attributes[:format] = @page.format end |