Support Wiki with UTF-8 page name

8acad49f · Hiroyuki Sato · 37707ac5 · 8acad49f · 8acad49f · 8acad49f
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.6.0 (unreleased)
    setup. A password can be provided during setup (see installation docs), or
    GitLab will ask the user to create a new one upon first visit.
  - Fix issue when pushing to projects ending in .wiki
+  - Add support for wiki with UTF-8 page names (Hiroyuki Sato)
  - Don't load all of GitLab in mail_room
  - Update `omniauth-saml` to 1.5.0 to allow for custom response attributes to be set
  - Memoize @group in Admin::GroupsController (Yatish Mehta)

--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,9 @@ gem "gitlab_git", '~> 9.0'
 gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"

 # Git Wiki
-gem 'gollum-lib', '~> 4.1.0'
+# Required manually in config/initializers/gollum.rb to control load order
+gem 'gollum-lib', '~> 4.1.0', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.2', require: false

 # Language detection
 gem "github-linguist", "~> 4.7.0", require: "linguist"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -381,6 +381,9 @@ GEM
      rouge (~> 1.9)
      sanitize (~> 2.1.0)
      stringex (~> 2.5.1)
+    gollum-rugged_adapter (0.4.2)
+      mime-types (>= 1.15)
+      rugged (~> 0.24.0, >= 0.21.3)
    gon (6.0.1)
      actionpack (>= 3.0)
      json
@@ -703,7 +706,7 @@ GEM
    rubyntlm (0.5.2)
    rubypants (0.2.0)
    rufus-scheduler (3.1.10)
-    rugged (0.24.0b13)
+    rugged (0.24.0)
    safe_yaml (1.0.4)
    sanitize (2.1.0)
      nokogiri (>= 1.4.4)
@@ -941,6 +944,7 @@ DEPENDENCIES
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.1.0)
+  gollum-rugged_adapter (~> 0.4.2)
  gon (~> 6.0.1)
  grape (~> 0.13.0)
  grape-entity (~> 0.4.2)

--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -2,7 +2,7 @@ class ProjectWiki
  include Gitlab::ShellAdapter

  MARKUPS = {
-    'Markdown' => :md,
+    'Markdown' => :markdown,
    'RDoc'     => :rdoc,
    'AsciiDoc' => :asciidoc
  } unless defined?(MARKUPS)
@@ -47,7 +47,7 @@ def wiki_base_path
  def wiki
    @wiki ||= begin
      Gollum::Wiki.new(path_to_repo)
-    rescue Gollum::NoSuchPathError
+    rescue Rugged::OSError
      create_repo!
    end
  end
@@ -90,7 +90,7 @@ def find_file(name, version = nil, try_on_disk = true)
  def create_page(title, content, format = :markdown, message = nil)
    commit = commit_details(:created, message, title)

-    wiki.write_page(title, format, content, commit)
+    wiki.write_page(title, format.to_sym, content, commit)

    update_project_activity
  rescue Gollum::DuplicatePageError => e
@@ -101,7 +101,7 @@ def create_page(title, content, format = :markdown, message = nil)
  def update_page(page, content, format = :markdown, message = nil)
    commit = commit_details(:updated, message, page.title)

-    wiki.update_page(page, page.name, format, content, commit)
+    wiki.update_page(page, page.name, format.to_sym, content, commit)

    update_project_activity
  end

--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -62,7 +62,7 @@ def title=(new_title)
  # The raw content of this page.
  def content
    @attributes[:content] ||= if @page
-                                @page.raw_data
+                                @page.text_data
                              end
  end


--- a/config/initializers/gollum.rb
+++ b/config/initializers/gollum.rb
+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