Release 5.2.2

Fix query ? in mathjax script path (#1706 )
Delete dublicate error (#1700 )
2021-03-27 19:43:38 +01:00 · 2021-03-27 19:40:35 +01:00 · 2021-03-27 14:05:03 +01:00 · 2021-03-23 09:13:23 -07:00
14 changed files with 30 additions and 38 deletions
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
  s.required_ruby_version = '>= 1.9'

  s.name              = 'gollum'
-  s.version           = '5.2.1'
-  s.date              = '2021-02-25'
+  s.version           = '5.2.2'
+  s.date              = '2021-03-27'
  s.license           = 'MIT'

  s.summary     = 'A simple, Git-powered wiki.'
@@ -69,11 +69,11 @@ Gem::Specification.new do |s|
    lib/gollum/app.rb
    lib/gollum/assets.rb
    lib/gollum/helpers.rb
-    lib/gollum/public/assets/.sprockets-manifest-15b663a27211dc9de9a452b4b74462d7.json
-    lib/gollum/public/assets/app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css
-    lib/gollum/public/assets/app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css.gz
-    lib/gollum/public/assets/app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js
-    lib/gollum/public/assets/app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js.gz
+    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/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css
    lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css.gz
    lib/gollum/public/assets/editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js
@@ -12,27 +12,11 @@ require 'rhino' if RUBY_PLATFORM == 'java'
 require File.expand_path('../gollum/uri_encode_component', __FILE__)

 module Gollum
-  VERSION = '5.2.1'
+  VERSION = '5.2.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 = {}
@@ -1 +1 @@
-{"files":{"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js":{"logical_path":"app.js","mtime":"2021-03-23T13:37:58+05:00","size":135925,"digest":"7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2","integrity":"sha256-ekvRFfS8fs45vIBzyg/618XlXMWDexRkoS3q1JBc77I="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-01-05T19:44:49+05:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css":{"logical_path":"app.css","mtime":"2021-03-23T13:38:56+05:00","size":396615,"digest":"ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2","integrity":"sha256-rUPKZLKV2ERLEPIu6GjxhCkmivSY8bxRVDSHi2kON6I="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-01-05T19:44:49+05:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-01-05T19:44:49+05: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-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}
+{"files":{"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js":{"logical_path":"app.js","mtime":"2021-03-23T08:40:11-07:00","size":136020,"digest":"0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838","integrity":"sha256-D9Io4mv75v4xotomjrDpjngMEZHBqRit84M3eUbpyDg="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-02-24T23:16:14-08:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css":{"logical_path":"app.css","mtime":"2021-03-23T08:40:11-07:00","size":396615,"digest":"ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2","integrity":"sha256-rUPKZLKV2ERLEPIu6GjxhCkmivSY8bxRVDSHi2kON6I="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-02-24T23:16:14-08:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-02-24T23:16:14-08: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-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}
@@ -380,8 +380,12 @@ $(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();
  }
@@ -4,13 +4,15 @@
  <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="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="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="has-sidebar tabnav-div" id="edit-content">
    {{>editor}}
  </div>
@@ -5,8 +5,10 @@
 </div>
 <div class="tabnav">
  <nav class="tabnav-tabs">
-    <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>
+    <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-div" id="edit-content">{{>editor}}</div>
@@ -47,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
@@ -953,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')
+    assert last_response.body.include?('<script defer src="/wiki/gollum/assets/mathjax/MathJax.js?config=')
  end
  
  test 'compare view' do
Author	SHA1	Message	Date
Dawa Ometto	d2b0a22a8f	Release 5.2.2	2021-03-27 19:43:38 +01:00
Dawa Ometto	355e6b1f18	Fix query ? in mathjax script path (#1706 )	2021-03-27 19:40:35 +01:00
Nikita Ivanov	7a2c9107c3	Delete dublicate error (#1700 )	2021-03-27 14:05:03 +01:00
benjamin wil	127473fff8	Fix tab navigation styles (#1696 ) * Fix tabnav styles on #create and #edit views The Primer CSS-provided `tabnav` styles were not being used on the Edit and Preview tabs on the create and edit pages. After following Primer's documentation [1], it looks like we were using the `aria-current` attribute incorrectly. Dynamically adding/removing this attribute on the selected tab fixes the issue. [1]: https://primer-css-git-next-inputs.primer.now.sh/css/components/navigation#tabnav * Recompile static assets	2021-03-23 09:13:23 -07:00