diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-03-16 01:21:34 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-03-16 01:21:34 +0000 |
commit | c9c14584b79a389f6a558a9a0b20d1b7ded03407 (patch) | |
tree | 7467268a34d23aca40bfcf98e5d5613af621cdc3 /config | |
parent | f83a596db3b58a5c4f4a1667c9e9c89d173e66e5 (diff) | |
parent | 8acad49fe0a492c2f4e16756135679b3a190543b (diff) | |
download | gitlab-ce-c9c14584b79a389f6a558a9a0b20d1b7ded03407.tar.gz |
Merge branch 'support-utf8-wiki-page-title' into 'master'
Support Wiki with UTF-8 page name
## What does this MR do?
Support Wiki with UTF-8 page name.
See https://github.com/gollum/gollum/pull/929
## Why was this MR needed?
Relax constraints for wiki slug in aac6598482036e12a20b4c75f2a508bd6a017245.
It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error.
Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project.
## Workaround
1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone
2. Clone the wiki repo
3. Find the page with UTF-8 name
4. Rename or Delete these files
5. Commit and push
## What are the relevant issue numbers?
- #13979
- #13891
- #13698
- #13603
- #13317
- #12906
- #12825
- #10945
## Todo
- [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release
'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version),
but 'gitlab_git' gem depends on rugged v0.24.0b13.
So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now.
See merge request !2999
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/gollum.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb new file mode 100644 index 00000000000..703f24f93b2 --- /dev/null +++ b/config/initializers/gollum.rb @@ -0,0 +1,13 @@ +module Gollum + GIT_ADAPTER = "rugged" +end +require "gollum-lib" + +module Gollum + class Committer + # Patch for UTF-8 path + def method_missing(name, *args) + index.send(name, *args) + end + end +end |