From 862c6d5d2ea28f44f4764ddd2e6791c7b46fedf4 Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Sun, 29 Mar 2020 20:04:45 +0200 Subject: [PATCH 1/2] Restore --bare option --- README.md | 1 + bin/gollum | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 8162ca80..787eedf4 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ Gollum comes with the following command line options: | --port | [PORT] | Specify the port to bind Gollum with. Default: `4567`. | | --config | [FILE] | Specify path to Gollum's configuration file. | | --ref | [REF] | Specify the git branch to serve. Default: `master`. | +| --bare | none | Tell Gollum that the git repository should be treated as bare. | | --adapter | [ADAPTER] | Launch Gollum using a specific git adapter. Default: `rugged`.2 | | --base-path | [PATH] | Specify the leading portion of all Gollum URLs (path info). Setting this to `/wiki` will make the wiki accessible under `http://localhost:4567/wiki/`. Default: `/`. | | --page-file-dir | [PATH] | Specify the subdirectory for all pages. If set, Gollum will only serve pages from this directory and its subdirectories. Default: repository root. | diff --git a/bin/gollum b/bin/gollum index 897a9f0d..a7165d31 100755 --- a/bin/gollum +++ b/bin/gollum @@ -61,6 +61,9 @@ opts = OptionParser.new do |opts| opts.on('-r', '--ref [REF]', 'Specify the branch to serve. Default: \'master\'.') do |ref| wiki_options[:ref] = ref end + opts.on("--bare", "Declare '' to be bare. This is only necessary when using the grit adapter.") do + wiki_options[:repo_is_bare] = true + end opts.on('-a', '--adapter [ADAPTER]', 'Launch Gollum using a specific git adapter. Default: \'rugged\'.') do |adapter| Gollum::GIT_ADAPTER = adapter end From 28bfe02411de90a52a35a0ff055a1896a2a2024d Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Sun, 29 Mar 2020 20:13:09 +0200 Subject: [PATCH 2/2] Update travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73b20716..a1524638 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ rvm: - - 2.3.0 - 2.4.0 + - 2.6.0 - jruby-9.2.7.0 jdk: - oraclejdk9