Unverified Commit 7d9242bd authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #229483 from bbenno/gollum-5.3.2 

gollum: 5.3.1 -> 5.3.2
parents d24d8031 8589d082

pkgs/applications/misc/gollum/Gemfile.lock

+10 −10
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ GEM 
    gemojione (4.3.3)

      json

    github-markup (4.0.1)

    gollum (5.3.1)

    gollum (5.3.2)

      gemojione (~> 4.1)

      gollum-lib (>= 5.2.3, < 6.0)

      i18n (~> 1.8)
@@ -32,7 +32,7 @@ GEM 
      uglifier (~> 4.2)

      useragent (~> 0.16.2)

      webrick (~> 1.7)

    gollum-lib (5.2.3)

    gollum-lib (5.2.4)

      gemojione (~> 4.1)

      github-markup (~> 4.0)

      gollum-rugged_adapter (~> 2.0)
@@ -45,27 +45,27 @@ GEM 
      mime-types (~> 3.4)

      rugged (~> 1.5)

    htmlentities (4.3.4)

    i18n (1.12.0)

    i18n (1.13.0)

      concurrent-ruby (~> 1.0)

    json (2.6.3)

    kramdown (2.4.0)

      rexml

    kramdown-parser-gfm (1.1.0)

      kramdown (~> 2.0)

    loofah (2.19.1)

    loofah (2.20.0)

      crass (~> 1.0.2)

      nokogiri (>= 1.5.9)

    mime-types (3.4.1)

      mime-types-data (~> 3.2015)

    mime-types-data (3.2023.0218.1)

    mini_portile2 (2.8.1)

    mini_portile2 (2.8.2)

    multi_json (1.15.0)

    mustache (1.1.1)

    mustache-sinatra (2.0.0)

      mustache (~> 1.0)

    mustermann (2.0.2)

      ruby2_keywords (~> 0.0.1)

    nokogiri (1.14.2)

    nokogiri (1.14.3)

      mini_portile2 (~> 2.8.0)

      racc (~> 1.4)

    octicons (12.1.0)
@@ -75,7 +75,7 @@ GEM 
    psych (5.1.0)

      stringio

    racc (1.6.2)

    rack (2.2.6.4)

    rack (2.2.7)

    rack-protection (2.2.4)

      rack

    rb-fsevent (0.11.2)
@@ -89,7 +89,7 @@ GEM 
      rexml

    ruby2_keywords (0.0.5)

    rubypants (0.7.1)

    rugged (1.6.2)

    rugged (1.6.3)

    sass (3.7.4)

      sass-listen (~> 4.0.0)

    sass-listen (4.0.0)
@@ -111,7 +111,7 @@ GEM 
      rack (> 1, < 3)

    sprockets-helpers (1.4.0)

      sprockets (>= 2.2)

    stringio (3.0.5)

    stringio (3.0.6)

    therubyrhino (2.1.2)

      therubyrhino_jar (>= 1.7.4, < 1.7.9)

    therubyrhino_jar (1.7.8)
@@ -144,4 +144,4 @@ DEPENDENCIES 
  wikicloth



BUNDLED WITH

   2.4.6
 
   2.4.12

pkgs/applications/misc/gollum/gemset.nix

+18 −18
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1nx3ss1ck5mgj14580z73pfwri0l4f0ilnckh9mgxmi9i4rk24y2";

      sha256 = "07lv4idxxghmq18k2r42l7kxz204l2fgri5xjapl79yy9dk53s5x";

      type = "gem";

    };

    version = "5.3.1";

    version = "5.3.2";

  };

  gollum-lib = {

    dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
@@ -117,10 +117,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "11bs7yfkznz7rdzxc9am53mix5nnv8505d565j4cci2bg6iqy2dz";

      sha256 = "15nkslf8vm4gr8wbicm5xwsmgqy22zy3gb6pgdzdm78vyqva055d";

      type = "gem";

    };

    version = "5.2.3";

    version = "5.2.4";

  };

  gollum-rugged_adapter = {

    dependencies = ["mime-types" "rugged"];
@@ -149,10 +149,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";

      sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";

      type = "gem";

    };

    version = "1.12.0";

    version = "1.13.0";

  };

  json = {

    groups = ["default"];
@@ -192,10 +192,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";

      sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8";

      type = "gem";

    };

    version = "2.19.1";

    version = "2.20.0";

  };

  mime-types = {

    dependencies = ["mime-types-data"];
@@ -223,10 +223,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";

      sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";

      type = "gem";

    };

    version = "2.8.1";

    version = "2.8.2";

  };

  multi_json = {

    groups = ["default"];
@@ -276,10 +276,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7";

      sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v";

      type = "gem";

    };

    version = "1.14.2";

    version = "1.14.3";

  };

  octicons = {

    dependencies = ["nokogiri"];
@@ -329,10 +329,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";

      sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";

      type = "gem";

    };

    version = "2.2.6.4";

    version = "2.2.7";

  };

  rack-protection = {

    dependencies = ["rack"];
@@ -443,10 +443,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0z33vpk4g24zdhrwsmwbr3mhb0xpdl6jna2nscrwgq77xl6iw4jg";

      sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";

      type = "gem";

    };

    version = "1.6.2";

    version = "1.6.3";

  };

  sass = {

    dependencies = ["sass-listen"];
@@ -519,10 +519,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1al02vvy3df0q3jy8sblkgpf688bji84l4p4xq9gzkk469i23bis";

      sha256 = "10w46rlh844kax248l1m3pyrj94n1qpc9691j8r5v0rzdxibpy7v";

      type = "gem";

    };

    version = "3.0.5";

    version = "3.0.6";

  };

  therubyrhino = {

    dependencies = ["therubyrhino_jar"];