Change spacing behaviour of #wiki-sidebar

To make `#wiki-sidebar` and `#wiki-footer` more similar, we can make
sure `px-4` padding is applied to the `-content` container, rather than
the outer container.

.github/workflows/test.yaml

@@ -1,29 +0,0 @@
-name: Ruby Build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.4.0, 2.6.0, 3.0.0, jruby-9.2.18.0]
-    steps:
-      - run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
-      - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub!"
-      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - run: echo "The ${{ github.repository }} repository has been cloned to the runner."
-      - run: echo "The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ github.workspace }}
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '9'
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: exec rake
-        run: bundle exec rake

.gitignore

@@ -8,4 +8,3 @@ Gemfile.lock
 .*
 !.sprockets*
 !lib/gollum/public/gollum/stylesheets/_styles.css
-!.github*

.travis.yml

@@ -1,8 +1,7 @@
 rvm:
   - 2.4.0
   - 2.6.0
-  - 3.0.0
-  - jruby-9.2.18.0
+  - jruby-9.2.9.0
 jdk:
   - oraclejdk9
 before_install:

CONTRIBUTING.md

@@ -62,8 +62,6 @@ Pull Requests fixing bugs, implementing new features, or updating documentation
 	```
 	bundle exec rake test
 	```
-	
-To profile slow tests, you can use `bundle exec rake test TESTOPTS="--verbose"`.
 
 ### Working with test repositories
 

Gemfile

@@ -6,4 +6,5 @@ end
 
 gemspec
 
-gem 'rake', '~> 13.0'
+gem "rake", '~> 13.0'
+

HISTORY.md

@@ -1,22 +1,3 @@
-# 5.2.3 2021-04-18
-
-* Fix bug preventing page titles from being displayed
-
-# 5.2.1 2021-02-25
-
-* Fix include call to a missing asset (@benjaminwil). This caused slow first page loads on JRuby.
-
-# 5.2 2021-02-24
-
-* Improved styling and Primer upgrade (@benjaminwil)
-* Add redirect to rename commit (@ViChyavIn)
-* Updated dependencies
-* Bugfixes
-
-# 5.1.2
-
-* Guard against malicious filenames in breadcrumbs
-
 # 5.1
 
 * Bugfixes

README.md

@@ -2,10 +2,11 @@ gollum -- A git-based Wiki
 ====================================
 
 [![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
-![Build Status](https://github.com/gollum/gollum/actions/workflows/test.yaml/badge.svg)
+[![Build Status](https://travis-ci.org/gollum/gollum.svg?branch=master)](https://travis-ci.org/gollum/gollum)
 [![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
 [![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/info)
 
+**Please update to gollum 5.1.2 to counter a recent exploit. More info will follow after CVE is assigned.**
 
 **Gollum version 5.0 is out!** See [here](https://github.com/gollum/gollum/wiki/5.0-release-notes) for a list of changes and new features compared to Gollum version 4.x, and see some [Screenshots](https://github.com/gollum/gollum/wiki/Screenshots) of Gollum's features.
 
@@ -46,7 +47,7 @@ Installation examples for individual systems can be seen [here](https://github.c
 
 To run, simply:
 
-1. Run: `gollum /path/to/wiki` where `/path/to/wiki` is an initialized Git repository.
+1. Run: `gollum /path/to/wiki`.
 2. Open `http://localhost:4567` in your browser.
 
 See [below](#running-from-source) for information on running Gollum from source, as a Rack app, and more.

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum'
-  s.version           = '5.2.3'
-  s.date              = '2021-04-18'
+  s.version           = '5.1.2'
+  s.date              = '2021-01-03'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -38,8 +38,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'sprockets-helpers', '~> 1.2'
   s.add_dependency 'rss', '~> 0.2.9'
   s.add_dependency 'therubyrhino', '~> 2.1.0'
-  s.add_dependency 'webrick', '~> 1.7'
-  s.add_dependency 'i18n', '~> 1.8'
 
   s.add_development_dependency 'rack-test', '~> 0.6.3'
   s.add_development_dependency 'shoulda', '~> 3.6.0'
@@ -47,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'twitter_cldr', '~> 3.2.0'
   s.add_development_dependency 'mocha', '~> 1.8.0'
   s.add_development_dependency 'test-unit', '~> 3.3.0'
+  s.add_development_dependency 'webrick', '~> 1.4.2'
 
   # = MANIFEST =
   s.files = %w[
@@ -60,7 +59,6 @@ Gem::Specification.new do |s|
     bin/gollum-migrate-tags
     config.rb
     config.ru
-    contrib/automation/gollum-post
     contrib/openrc/conf.d/gollum
     contrib/openrc/init.d/gollum
     contrib/systemd/gollum@.service
@@ -70,15 +68,15 @@ Gem::Specification.new do |s|
     lib/gollum/app.rb
     lib/gollum/assets.rb
     lib/gollum/helpers.rb
-    lib/gollum/public/assets/.sprockets-manifest-de7bb79aec424e55af1acdcc4237b301.json
-    lib/gollum/public/assets/app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js
-    lib/gollum/public/assets/app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js.gz
-    lib/gollum/public/assets/app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css
-    lib/gollum/public/assets/app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css.gz
+    lib/gollum/public/assets/.sprockets-manifest-35882cacf71c40928e0c2dc9b8acf8fe.json
+    lib/gollum/public/assets/app-4215e58002a43c4b2e9f0f7caa05a81c7c09d22a918c6fe40cd8e423db3110b5.css
+    lib/gollum/public/assets/app-4215e58002a43c4b2e9f0f7caa05a81c7c09d22a918c6fe40cd8e423db3110b5.css.gz
+    lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js
+    lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js.gz
     lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css
     lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css.gz
-    lib/gollum/public/assets/editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js
-    lib/gollum/public/assets/editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js.gz
+    lib/gollum/public/assets/editor-b621bfe2cb8823516fb3a96c32e82001b297f6754117b47bdad6e59db85a9d08.js
+    lib/gollum/public/assets/editor-b621bfe2cb8823516fb3a96c32e82001b297f6754117b47bdad6e59db85a9d08.js.gz
     lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css
     lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css.gz
     lib/gollum/public/gollum/javascript/HOWTO_UPDATE_ACE.md
@@ -1176,18 +1174,18 @@ Gem::Specification.new do |s|
     lib/gollum/public/gollum/javascript/jquery-1.7.2.min.js
     lib/gollum/public/gollum/javascript/jquery.resize.js
     lib/gollum/public/gollum/javascript/mousetrap.min.js
-    lib/gollum/public/gollum/javascript/polyfills.js
     lib/gollum/public/gollum/stylesheets/_base.scss
     lib/gollum/public/gollum/stylesheets/_breakpoint.scss
     lib/gollum/public/gollum/stylesheets/_component.scss
     lib/gollum/public/gollum/stylesheets/_features.scss
+    lib/gollum/public/gollum/stylesheets/_layout.scss
     lib/gollum/public/gollum/stylesheets/_spinners.scss
     lib/gollum/public/gollum/stylesheets/app.scss
     lib/gollum/public/gollum/stylesheets/criticmarkup.scss
     lib/gollum/public/gollum/stylesheets/dialog.scss
     lib/gollum/public/gollum/stylesheets/editor.scss
     lib/gollum/public/gollum/stylesheets/emoji.scss
-    lib/gollum/public/gollum/stylesheets/primer.css
+    lib/gollum/public/gollum/stylesheets/primer.scss
     lib/gollum/public/gollum/stylesheets/print.scss
     lib/gollum/public/gollum/stylesheets/spinner.scss
     lib/gollum/public/gollum/stylesheets/tables.scss
@@ -1204,7 +1202,6 @@ Gem::Specification.new do |s|
     lib/gollum/templates/history_authors/none.mustache
     lib/gollum/templates/latest_changes.mustache
     lib/gollum/templates/layout.mustache
-    lib/gollum/templates/mobilenav.mustache
     lib/gollum/templates/navbar.mustache
     lib/gollum/templates/overview.mustache
     lib/gollum/templates/page.mustache

lib/gollum.rb

@@ -5,23 +5,35 @@ require 'digest/sha1'
 require 'ostruct'
 
 # external
-require 'i18n'
 require 'github/markup'
 require 'rhino' if RUBY_PLATFORM == 'java'
 
 # internal
-require ::File.expand_path('../gollum/uri_encode_component', __FILE__)
+require File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '5.2.3'
-
-  ::I18n.available_locales = [:en]
-  ::I18n.load_path = Dir[::File.expand_path("lib/gollum/locales") + "/*.yml"]
+  VERSION = '5.1.2'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
   end
 
+  class Error < StandardError;
+  end
+
+  class DuplicatePageError < Error
+    attr_accessor :dir
+    attr_accessor :existing_path
+    attr_accessor :attempted_path
+
+    def initialize(dir, existing, attempted, message = nil)
+      @dir            = dir
+      @existing_path  = existing
+      @attempted_path = attempted
+      super(message || "Cannot write #{@dir}/#{@attempted_path}, found #{@dir}/#{@existing_path}.")
+    end
+  end
+  
   class TemplateFilter
     @@filters = {}
 
@@ -36,4 +48,5 @@ module Gollum
       data
     end
   end
+
 end

lib/gollum/app.rb

@@ -1,5 +1,4 @@
-# encoding: UTF-8
-
+# ~*~ encoding: utf-8 ~*~
 require 'cgi'
 require 'sinatra'
 require 'sinatra/namespace'
@@ -15,7 +14,6 @@ require 'pathname'
 require 'gollum'
 require 'gollum/assets'
 require 'gollum/views/helpers'
-require 'gollum/views/helpers/locale_helpers'
 require 'gollum/views/layout'
 require 'gollum/views/editable'
 require 'gollum/views/has_page'
@@ -42,7 +40,7 @@ Gollum::set_git_max_filesize(190 * 10**6)
 # See the wiki.rb file for more details on wiki options
 
 module Precious
-
+  
   # For use with the --base-path option.
   class MapGollum
     def initialize(base_path)
@@ -65,14 +63,12 @@ module Precious
       @mg.call(env)
     end
   end
-
+  
   class App < Sinatra::Base
     register Mustache::Sinatra
     register Sinatra::Namespace
     include Precious::Helpers
-
-    Encoding.default_external = "UTF-8"
-
+    
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :sprockets, ::Precious::Assets.sprockets(dir)
@@ -106,7 +102,7 @@ module Precious
       @critic_markup = settings.wiki_options[:critic_markup]
       @redirects_enabled = settings.wiki_options.fetch(:redirects_enabled, true)
       @per_page_uploads = settings.wiki_options[:per_page_uploads]
-
+      
       @wiki_title = settings.wiki_options.fetch(:title, 'Gollum Wiki')
 
       forbid unless @allow_editing || request.request_method == 'GET'
@@ -121,10 +117,10 @@ module Precious
       @js  = settings.wiki_options[:js]
       @mathjax_config = settings.wiki_options[:mathjax_config]
 
-      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
+      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment == :production || settings.environment == :staging)
       @static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
       @mathjax_path = ::File.join(File.dirname(__FILE__), 'public/gollum/javascript/MathJax')
-
+      
       Sprockets::Helpers.configure do |config|
         config.environment = settings.sprockets
         config.environment.context_class.class_variable_set(:@@base_url, @base_url)
@@ -223,7 +219,7 @@ module Precious
 
       # AJAX calls only
       post '/upload_file' do
-
+        
         wiki = wiki_new
         halt 405 unless wiki.allow_uploads
 
@@ -239,7 +235,7 @@ module Precious
           dir.sub!(/^#{wiki.base_path}/, '') if wiki.base_path
           # remove base_url and gollum/* subpath if necessary
           dir.sub!(/^\/gollum\/[-\w]+\//, '')
-          # remove file extension
+          # remove file extension 
           dir.sub!(/#{::File.extname(dir)}$/, '')
           # revert escaped whitespaces
           dir.gsub!(/%20/, ' ')
@@ -321,7 +317,7 @@ module Precious
       end
 
       post '/edit/*' do
-        etag      = params[:etag]
+        etag      = params[:etag]        
         path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
         wiki      = wiki_new
         page      = wiki.page(::File.join(path, params[:page]))
@@ -331,7 +327,7 @@ module Precious
           # Signal edit collision and return the page's most recent version
           halt 412, {etag: page.sha, text_data: page.text_data}.to_json
         end
-
+        
         committer = Gollum::Committer.new(wiki, commit_message)
         commit    = { :committer => committer }
 
@@ -352,7 +348,7 @@ module Precious
           commit[:message] = "Deleted #{filepath}"
           wiki.delete_file(filepath, commit)
         end
-      end
+      end      
 
       get '/create/*' do
         forbid unless @allow_editing
@@ -410,7 +406,7 @@ module Precious
         else
           sha2, sha1 = sha1, "#{sha1}^" if !sha2
           @versions  = [sha1, sha2]
-          @diff      = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
+          @diff      = wiki.repo.diff(@versions.first, @versions.last, @page.path)
           @message   = 'The patch does not apply.'
           mustache :compare
         end
@@ -475,7 +471,7 @@ module Precious
         @versions = [start_version, end_version]
         wiki      = wikip.wiki
         @page     = wikip.page
-        @diff     = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
+        @diff     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
         if @diff.empty?
           @message = 'Could not compare these two revisions, no differences were found.'
           mustache :error
@@ -519,7 +515,7 @@ module Precious
           @commit = wiki.repo.commit(version)
           parent = @commit.parent
           parent_id = parent.nil? ? nil : parent.id
-          @diff = wiki.repo.diff(parent_id, version).force_encoding('utf-8')
+          @diff = wiki.repo.diff(parent_id, version)
           mustache :commit
         rescue Gollum::Git::NoSuchShaFound
           @message = "Invalid commit: #{@version}"
@@ -629,7 +625,7 @@ module Precious
         end
       end
     end
-
+    
     def show_file(file)
       return unless file
       if file.on_disk?
@@ -687,4 +683,4 @@ module Precious
     end
 
   end
-end
+end

lib/gollum/public/assets/.sprockets-manifest-4f9a7c1631645007e06e679282bea889.json

@@ -1 +0,0 @@
-{"files":{"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js":{"logical_path":"app.js","mtime":"2021-07-08T06:42:59+09:00","size":136020,"digest":"0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838","integrity":"sha256-D9Io4mv75v4xotomjrDpjngMEZHBqRit84M3eUbpyDg="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-07-08T05:19:03+09:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css":{"logical_path":"app.css","mtime":"2021-07-08T06:42:59+09:00","size":396625,"digest":"cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694","integrity":"sha256-yxIrTBdQD6peATy0MzT6/PLdfXL2lLBtlhb4sz/vtpQ="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-07-08T05:19:03+09:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-07-08T05:19:03+09:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}

lib/gollum/public/assets/.sprockets-manifest-e3f9b0be36ac3bccc4c006a52e352500.json

@@ -0,0 +1 @@
+{"files":{"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js":{"logical_path":"app.js","mtime":"2021-02-19T21:46:58-08:00","size":135925,"digest":"7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2","integrity":"sha256-ekvRFfS8fs45vIBzyg/618XlXMWDexRkoS3q1JBc77I="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-02-17T20:47:49-08:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css":{"logical_path":"app.css","mtime":"2021-02-19T21:46:58-08:00","size":396661,"digest":"7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6","integrity":"sha256-egu/8ui60wM+fBfg4PiG8zap0j07kS3NKuOJxItLY+Y="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-02-17T20:47:49-08:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-02-17T20:47:49-08:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}

lib/gollum/public/gollum/javascript/gollum.js.erb

@@ -380,12 +380,8 @@ $(document).ready(function() {
       active_tab = '#edit.tabnav-tab';
     }
 
-    $('.tabnav-tab.selected').removeAttr('aria-current');
     $('.tabnav-tab.selected').removeClass('selected');
-
-    $(active_tab).attr('aria-current', 'page');
     $(active_tab).addClass('selected');
-
     $('.tabnav-div').hide();
     $(active_div).show();
   }

lib/gollum/public/gollum/stylesheets/dialog.scss

@@ -147,3 +147,7 @@
     }
   }
 }
+
+#gollum-dialog-dialog-buttons {
+  overflow: hidden;
+}

lib/gollum/public/gollum/stylesheets/editor.scss

@@ -29,7 +29,6 @@ a.tabnav-tab:focus {
   overflow: hidden;
   font-family: Consolas, "Liberation Mono", Courier, monospace;
   font-size: 1em;
-  padding: 0;
 }
 
 #gollum-editor {

lib/gollum/templates/create.mustache

@@ -4,15 +4,13 @@
   <h1 class="py-4">Create New Page</h1>
 </div>
 <div id="wiki-content" class="create edit">
-  <div class="tabnav">
-    <nav class="tabnav-tabs" aria-label="Toggle edit or preview mode">
-      <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
-        Edit
-      </a>
-      <a href="#" id="preview" class="tabnav-tab">Preview</a>
-    </nav>
-  </div>
-
+	<div class="tabnav">
+	  <nav class="tabnav-tabs" aria-label="Foo bar">
+	    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
+	    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
+	  </nav>
+	</div>
+	
   <div class="has-sidebar tabnav-div" id="edit-content">
     {{>editor}}
   </div>

lib/gollum/templates/edit.mustache

@@ -5,10 +5,8 @@
 </div>
 <div class="tabnav">
   <nav class="tabnav-tabs">
-    <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
-      Edit
-    </a>
-    <a href="#" id="preview" class="tabnav-tab">Preview</a>
+    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
+    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
   </nav>
 </div>
   <div class="tabnav-div" id="edit-content">{{>editor}}</div>

lib/gollum/templates/editor.mustache

@@ -37,7 +37,7 @@
 			<button class="btn btn-sm function-button" id="function-h3" title="Heading 3">h3</button>
 			<span class="pr-2"></span>
 			<button class="btn btn-sm function-button" id="function-link" title="Link">{{#octicon}}link{{/octicon}}</button>
-			<button class="btn btn-sm function-button" id="function-image" title="Image">{{#octicon}}image{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-image" title="Image">{{#octicon}}file-media{{/octicon}}</button>
 			<span class="pr-2"></span>
 			{{#critic_markup}}
 			<button class="btn btn-sm function-button" id="function-critic-accept" title="Accept Selected CriticMarkup">{{#octicon}}plus{{/octicon}}</button>
@@ -50,13 +50,13 @@
 
     <div id="gollum-editor-format-selector">
       <label for="format">Keybinding</label>
-      <select id="keybinding" name="keybinding" class="form-select input-sm">
+      <select id="keybinding" name="keybinding" class="form-select">
         <option selected="selected">default</option>
         <option>vim</option>
         <option>emacs</option>
       </select>
       <label for="format">Markup</label>
-      <select id="wiki_format" name="format" class="form-select input-sm">
+      <select id="wiki_format" name="format" class="form-select">
       {{#formats}}
       {{#enabled}}
       <option {{#selected}}selected="selected" {{/selected}}value="{{id}}" data-ext="{{ext}}">

lib/gollum/templates/latest_changes.mustache

@@ -13,7 +13,7 @@
 		<li class="Box-row Box-row--hover-gray border-top d-flex flex-items-center">
 			<span class="float-left col-2" id="user-icons">{{>author_template}}</span>
 			<span class="flex-auto col-1 text-gray-light">{{date}}</span>
-			<span class="flex-auto col-5">{{message}}<br/>
+			<span class="flex-auto col-7">{{message}}<br/>
 			{{#files}}
 			  <span class="flex-auto col-2">{{#renamed}}{{renamed}} -> {{/renamed}}<a href="{{link}}">{{file}}</a></span><br/>
 			{{/files}}

lib/gollum/templates/layout.mustache

@@ -5,6 +5,7 @@
   <meta name="MobileOptimized" content="width">
   <meta name="HandheldFriendly" content="true">
   <meta name="viewport" content="width=device-width">
+  {{#sprockets_stylesheet_tag}}primer{{/sprockets_stylesheet_tag}}
   {{#sprockets_stylesheet_tag}}app{{/sprockets_stylesheet_tag}}
   {{#sprockets_stylesheet_tag}}print print{{/sprockets_stylesheet_tag}}
 

lib/gollum/templates/navbar.mustache

@@ -1,103 +1,105 @@
-<nav class="TableObject actions pt-4 px-2 px-lg-0 overflow-x-scroll">
-  <div class="TableObject-item hide-lg hide-xl">
-    {{>mobilenav}}
-  </div>
-
-  <div class="TableObject-item hide-sm hide-md">
-    <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
-      Home
-    </a>
-  </div>
-
-  <div
-    class="TableObject-item TableObject-item--primary px-2"
-    {{^search}}style="visibility:hidden"{{/search}}
-  >
-    {{>searchbar}}
-  </div>
-
-  <div class="TableObject-item hide-sm hide-md">
-    <div class="BtnGroup d-flex">
-      {{#overview}}
-        <a
-          class="btn BtnGroup-item btn-sm"
-          href="{{overview_path}}"
-          id="minibutton-overview"
-        >
-          Overview
-        </a>
-      {{/overview}}
-
-      {{#latest_changes}}
-        <a
-          class="btn BtnGroup-item btn-sm"
-          href="{{latest_changes_path}}"
-          id="minibutton-latest-changes"
-        >
-          Latest Changes
-        </a>
-      {{/latest_changes}}
+<nav class="actions pt-4 px-2 px-lg-0 overflow-x-scroll">
+  <div class="TableObject">
+    <div class="TableObject-item hide-lg hide-xl">
+      {{>mobilenav}}
     </div>
-  </div>
 
-  <div class="TableObject-item px-2">
-    <div class="BtnGroup d-flex">
-      {{#history}}
+    <div class="TableObject-item hide-sm hide-md">
+      <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
+        Home
+      </a>
+    </div>
+
+    <div
+      class="TableObject-item TableObject-item--primary px-2"
+      {{^search}}style="visibility:hidden"{{/search}}
+    >
+      {{>searchbar}}
+    </div>
+
+    <div class="TableObject-item hide-sm hide-md">
+      <div class="BtnGroup" style="display: flex;">
+        {{#overview}}
+          <a
+            class="btn BtnGroup-item btn-sm"
+            href="{{overview_path}}"
+            id="minibutton-overview"
+          >
+            Overview
+          </a>
+        {{/overview}}
+
+        {{#latest_changes}}
+          <a
+            class="btn BtnGroup-item btn-sm"
+            href="{{latest_changes_path}}"
+            id="minibutton-latest-changes"
+          >
+            Latest Changes
+          </a>
+        {{/latest_changes}}
+      </div>
+    </div>
+
+    {{#history}}
+      <div class="TableObject-item pl-2 hide-sm hide-md">
         <a
-          class="btn BtnGroup-item btn-sm hide-sm hide-md"
+          class="btn btn-sm"
           href="{{history_path}}/{{escaped_url_path}}"
           id="minibutton-history"
         >
-          History
-        </a>
-      {{/history}}
-
-      {{#allow_editing}}
-        {{#allow_uploads}}
-          <button
-            class="btn BtnGroup-item btn-sm hide-sm hide-md
-              minibutton-upload-page"
-          >
-            Upload
-          </button>
-        {{/allow_uploads}}
-
-        {{#editable}}
-          <button
-            class="btn BtnGroup-item btn-sm hide-sm hide-md
-              minibutton-rename-page"
-          >
-            Rename
-          </button>
-          <a
-            class="btn BtnGroup-item btn-sm hide-sm hide-md"
-            href="{{edit_path}}/{{escaped_url_path}}"
-            id="minibutton-edit-page"
-          >
-            Edit
-          </a>
-        {{/editable}}
-      {{/allow_editing}}
-    </div>
-  </div>
-
-  {{#allow_editing}}
-    {{#editable}}
-      <div class="TableObject-item">
-        <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
-          New
+          Page History
         </a>
       </div>
-    {{/editable}}
+    {{/history}}
 
-    {{^editable}}
-      {{#newable}}
+    {{#allow_editing}}
+      <div class="TableObject-item px-2">
+        <div class="BtnGroup" style="display: flex;">
+          {{#allow_uploads}}
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md
+                minibutton-upload-page"
+            >
+              Upload
+            </a>
+          {{/allow_uploads}}
+
+          {{#editable}}
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md
+                minibutton-rename-page"
+            >
+              Rename
+            </a>
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md"
+              href="{{edit_path}}/{{escaped_url_path}}"
+              id="minibutton-edit-page"
+            >
+              Edit
+            </a>
+          {{/editable}}
+        </div>
+      </div>
+
+      {{#editable}}
         <div class="TableObject-item">
           <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
             New
           </a>
         </div>
-      {{/newable}}
-    {{/editable}}
-  {{/allow_editing}}
+      {{/editable}}
+
+      {{^editable}}
+        {{#newable}}
+          <div class="TableObject-item">
+            <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
+              New
+            </a>
+          </div>
+        {{/newable}}
+      {{/editable}}
+    {{/allow_editing}}
+  </div>
 </nav>

lib/gollum/views/compare.rb

@@ -20,7 +20,7 @@ module Precious
       def lines(diff = @diff)
         lines = []
         lines_to_parse = diff.split("\n")[3..-1]
-        lines_to_parse = lines_to_parse[2..-1] if lines_to_parse[0] =~ /^(---|rename to )/
+        lines_to_parse = lines_to_parse[2..-1] if lines_to_parse[0].start_with?('---')
 
         if lines_to_parse.nil? || lines_to_parse.empty?
           lines_to_parse = []  # File is created without content

lib/gollum/views/helpers/locale_helpers.rb

@@ -1,82 +0,0 @@
-module Precious
-  module Views
-    module LocaleHelpers
-      NO_METHOD_MESSAGE = 'Argument must be a view method'
-      YAML_VARIABLE_REGEXP = /\%\{[\w]+\}/
-
-      # Returns all I18n translation strings for the current view class.
-      # This method support YAML arguments. For example:
-      #
-      #     last_edited: This content was last edited at %{date}.
-      #
-      # Where the `date` argument must be a method available on the current
-      # class.
-      #
-      # Use this interface within Mustache templates to render any user
-      # interface strings in the current locale. For example:
-      #
-      #     {{ t.last_edited }}
-      #
-      def t
-        autofill I18n.t(locale_klass_name)
-      end
-
-      private
-
-      # Recursively looks up I18n translation values and autofills any YAML
-      # arguments with the return value of the current class's matching method.
-      #
-      # When a translation value with an argument has no matching method, we
-      # then return that value transformed to include the `no_method_message`
-      #
-      def autofill(yaml)
-        yaml.map { |i18n_key, i18n_value|
-          if i18n_value.is_a? Hash
-            [i18n_key, autofill(i18n_value)]
-          elsif has_arguments?(i18n_value)
-            fill_argument_content(i18n_key, i18n_value)
-          else
-            [i18n_key, i18n_value]
-          end
-        }.to_h
-      end
-
-      def fill_argument_content(i18n_key, i18n_value)
-        i18n_value.gsub!(YAML_VARIABLE_REGEXP) do |argument|
-          method_name = argument.gsub(/[^\w]/, '')
-
-          next if method_name.nil?
-
-          begin
-            self.public_send(method_name)
-          rescue NoMethodError => error
-            no_method_message(method_name)
-          end
-        end
-
-        [i18n_key, i18n_value]
-      end
-
-      def has_arguments?(i18n_value)
-        i18n_value.match?(YAML_VARIABLE_REGEXP)
-      end
-
-      # Returns the current class name in a format that is acceptable in YAML.
-      # To summarize its function:
-      #
-      #     NameOfConstant => name_of_constant
-      #
-      def locale_klass_name
-        @locale_klass_name ||= self.class.name.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          tr('-', '_').
-          downcase
-      end
-
-      def no_method_message(method_name, message = NO_METHOD_MESSAGE)
-        "[#{message}: #{method_name}]"
-      end
-    end
-  end
-end

lib/gollum/views/layout.rb

@@ -6,11 +6,10 @@ module Precious
       include Rack::Utils
       include Sprockets::Helpers
       include Precious::Views::AppHelpers
-      include Precious::Views::LocaleHelpers
       include Precious::Views::SprocketsHelpers
       include Precious::Views::RouteHelpers
       include Precious::Views::OcticonHelpers
-
+      
       alias_method :h, :escape_html
 
       attr_reader :name, :path
@@ -48,7 +47,7 @@ module Precious
       end
 
       def mathjax_js
-        "#{page_route('gollum/assets/mathjax/MathJax.js')}?config=TeX-AMS-MML_HTMLorMML"
+        page_route("gollum/assets/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML")
       end
 
       def css # custom css

lib/gollum/views/page.rb

@@ -16,11 +16,6 @@ module Precious
       DEFAULT_AUTHOR = 'you'
       @@to_xml       = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
 
-      def title
-        h1 = @h1_title ? page_header_from_content(@content) : false
-        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
-      end
-
       def page_header
         title
       end
@@ -268,6 +263,11 @@ module Precious
           end
         result << "</tr>\n</table>\n"
       end
+
+      def title
+        h1 = @h1_title ? page_header_from_content(@content) : false
+        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
+      end
     end
   end
 end

test/gollum/views/test_locale_helper.rb

@@ -1,134 +0,0 @@
-require_relative "../../helper"
-require_relative "../../../lib/gollum/views/helpers"
-
-describe Precious::Views::LocaleHelpers do
-  class TestClass < Mustache
-    include Precious::Views::LocaleHelpers
-
-    def author
-      "J.R.R."
-    end
-
-    def location
-      "Bloemfontein"
-    end
-  end
-
-  def setup
-    ::I18n.available_locales = [:en, :de]
-    ::I18n.load_path = Dir[File.expand_path("test/support/locales" + "/*.yml")]
-  end
-
-  def teardown
-    I18n.locale = :en
-  end
-
-  let(:dummy_instance) { TestClass.new }
-
-  describe "#t" do
-    describe "mustache usage" do
-      let(:subject) { dummy_instance.render(mustache_template) }
-
-      let(:mustache_template) { "{{ t.hello_world }}" }
-
-      describe "in the default locale" do
-        it "returns the translation string" do
-          _(subject).must_equal "Hello world"
-        end
-      end
-
-      describe "in the configured locale" do
-        it "returns the translation string" do
-          I18n.locale = :de
-
-          _(subject).must_equal "Hallo Welt"
-        end
-      end
-
-      describe "translations with YAML arguments" do
-        let(:mustache_template) { "{{ t.author_info.full }}" }
-
-        describe "in the default locale" do
-          it "autofills YAML arguments" do
-            _(subject).must_equal "Author J.R.R. is from Bloemfontein"
-          end
-        end
-
-        describe "in the configured locale" do
-          it "autofills YAML arguments" do
-            I18n.locale = :de
-
-            _(subject).must_equal "Autor J.R.R. ist vom Bloemfontein"
-          end
-        end
-      end
-
-      describe "translations with invalid arguments" do
-        let(:mustache_template) { "{{ t.has_invalid_argument }}" }
-
-        it "fails gracefully with embedded error message" do
-          expected_string = "Welcome to " \
-            "[#{TestClass::NO_METHOD_MESSAGE}: no_matching_method]"
-
-          _(subject).must_equal expected_string
-        end
-      end
-
-      describe "out of scope translations" do
-        let(:mustache_template) { "{{ t.never_called }}" }
-
-        it "does not include translation keys from other classes" do
-          _(subject).must_be_empty
-        end
-      end
-
-      describe "missing translations" do
-        let(:mustache_template) { "{{ t.nested.nonexistent_key }}" }
-
-        it "outputs an empty string" do
-          _(subject).must_be_empty
-        end
-      end
-    end
-
-    describe "usage" do
-      let(:subject) { dummy_instance.t }
-
-      it "returns a hash" do
-        _(subject).must_be_kind_of Hash
-      end
-
-      it "returns translation keys under 'test_class'" do
-        i18n_keys = I18n.t("test_class").keys
-
-        _(subject.keys).must_equal i18n_keys
-      end
-
-      it "does not return translation keys under other classes" do
-        other_i18n_keys = I18n.t("nonexistant_test_class").keys
-
-        _(subject.keys).wont_include other_i18n_keys
-      end
-
-      it "returns nested keys" do
-        nested_keys = subject[:author_info].keys
-
-        _(nested_keys).must_equal [:full]
-      end
-
-      describe "auto-filled YAML arguments" do
-        let(:subject) { dummy_instance.t[:author_info][:full] }
-
-        it "auto-fills in the default locale" do
-          _(subject).must_equal "Author J.R.R. is from Bloemfontein"
-        end
-
-        it "auto-fills in a configured locale" do
-          I18n.locale = :de
-
-          _(subject).must_equal "Autor J.R.R. ist vom Bloemfontein"
-        end
-      end
-    end
-  end
-end

test/helper.rb

@@ -5,7 +5,6 @@ require 'shoulda'
 require 'mocha/setup'
 require 'fileutils'
 require 'minitest/reporters'
-require 'minitest/spec'
 require 'twitter_cldr'
 require 'tmpdir'
 
@@ -94,4 +93,4 @@ def context(*args, &block)
   klass.class_eval &block
 end
 
-$contexts = []
+$contexts = []

test/support/locales/de.yml

@@ -1,8 +0,0 @@
-de:
-  test_class:
-    author_info:
-      full: Autor %{author} ist vom %{location}
-    has_invalid_argument: Willkommen in %{no_matching_method}
-    hello_world: Hallo Welt
-  nonexistant_test_class:
-    never_called: Nie angerufen

test/support/locales/en.yml

@@ -1,8 +0,0 @@
-en:
-  test_class:
-    author_info:
-      full: Author %{author} is from %{location}
-    has_invalid_argument: Welcome to %{no_matching_method}
-    hello_world: Hello world
-  nonexistant_test_class:
-    never_called: Never called

test/test_app.rb

@@ -47,15 +47,6 @@ context "Frontend" do
     get '/gollum/assets/mathjax/MathJax.js'
     assert last_response.ok?
   end
-  
-  test 'compare with utf8' do
-    commit = { :name => 'user1', :email => 'user1' }
-    @wiki.write_page('Utf8', :markdown, '\n中文', commit)
-    page = @wiki.page('Utf8')
-    @wiki.update_page(page, nil, nil, "No utf-8", commit)
-    get "/gollum/compare/Utf8.md/#{page.versions.first.id}..#{page.versions.last.id}"
-    assert last_response.body.include?('<div class="gi pl-2">+\n中文</div>')
-  end
 
   test "UTF-8 headers href preserved" do
     page = 'utfh1'
@@ -962,7 +953,7 @@ context 'Frontend with base path' do
   test 'base path mathjax assets' do
     get '/wiki/Home'
     assert last_response.ok?
-    assert last_response.body.include?('<script defer src="/wiki/gollum/assets/mathjax/MathJax.js?config=')
+    assert last_response.body.include?('<script defer src="/wiki/gollum/assets/mathjax/MathJax.js')
   end
   
   test 'compare view' do

test/test_compare.rb

@@ -13,18 +13,6 @@ context "Precious::Views::Compare" do
     # Precious::App.set(:gollum_path, @path)
     @wiki = Gollum::Wiki.new(@path)
   end
-  
-  test 'rename diff' do
-    # JGit returns differenly formatted diffs for rename commits. Support both kinds of diff.
-    jgit_diff = "diff --git a/Foo.md b/Bar.md\nsimilarity index 100%\nrename from Foo.md\nrename to Bar.md"
-    rugged_diff = "diff --git a/Bar.md b/Bar.md\nnew file mode 100644\nindex 0000000..e69de29\n--- /dev/null\n+++ b/Bar.md\n"
-  
-    [jgit_diff, rugged_diff].each do |diff|
-      view = Precious::Views::Compare.new
-      view.instance_variable_set(:@diff, diff)
-      assert_equal [], view.lines
-    end
-  end
 
   test 'file addition diff' do
     view = Precious::Views::Compare.new

test/test_migrate.rb

@@ -44,7 +44,7 @@ def load_script(**args)
   end  
 end
 
-unless ENV['CI']
+unless ENV['TRAVIS']
 
   context '4.x -> 5.x tag migrator' do
     include Rack::Test::Methods

test/test_page_view.rb

@@ -38,31 +38,7 @@ context "Precious::Views::Page" do
     assert_include @view.breadcrumb, "数学 📘"
   end
 
-  test 'page <title> is the page header from content, if present' do
-    page_title = 'Page header from content'
-    @wiki.write_page(page_title, :markdown, 'Contents', commit_details)
-
-    @view = Precious::Views::Page.new.tap do |view|
-      view.instance_variable_set :@page, @wiki.page(page_title)
-      view.instance_variable_set :@h1_title, true
-    end
-
-    assert_equal @view.title, 'Page header from content'
-  end
-
-  test 'page <title> is URL path title if no h1 present' do
-    @wiki.write_page('dir/My path title', :markdown, 'Contents', commit_details)
-    page = @wiki.page('dir/My path title')
-
-    @view = Precious::Views::Page.new.tap do |view|
-      view.instance_variable_set :@page, page
-      view.instance_variable_set :@h1_title, false
-    end
-
-    assert_equal @view.title, 'My path title'
-  end
-
-  test "page header retains unicode and ASCII characters" do
+  test "page header retains unicde and ASCII characters" do
     title = "数学 📘"
     @wiki.write_page(title, :markdown, "How old is Bilbo?")
     page = @wiki.page(title)