Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump gollum from 1.3.0 to 4.0.1 #325

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump gollum from 1.3.0 to 4.0.1 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "http://rubygems.org"

gem 'bundler', '~>1.0.12'
gem 'gollum-site'
gem 'gollum', '=1.3.0'
gem 'gollum', '4.0.1'
gem 'rdiscount'
gem 'pygmentize'
gem 'rake'
Expand Down
84 changes: 55 additions & 29 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.6)
albino (1.3.3)
posix-spawn (>= 0.3.6)
diff-lcs (1.1.3)
charlock_holmes (0.7.6)
diff-lcs (1.3)
directory_watcher (1.4.1)
engineyard (1.4.0)
engineyard-serverside-adapter (= 1.5.0)
Expand All @@ -19,50 +18,77 @@ GEM
escape (~> 0.0.4)
json_pure
escape (0.0.4)
github-markup (0.5.3)
gollum (1.3.0)
albino (~> 1.3.2)
github-markup (>= 0.4.0, < 1.0.0)
grit (~> 2.4.1)
mustache (>= 0.11.2, < 1.0.0)
nokogiri (~> 1.4)
sanitize (~> 2.0.0)
sinatra (~> 1.0)
gemojione (3.3.0)
json
github-markup (1.7.0)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gollum (4.0.1)
gollum-lib (~> 4.0, >= 4.0.1)
kramdown (~> 1.8.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.14.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.10)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 2.1)
sanitize (~> 2.1.1, >= 2.1.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
gollum-site (0.1.10)
directory_watcher
gollum (>= 1.2.0)
liquid (>= 2.2.2)
mixlib-log (>= 1.1.0)
grit (2.4.1)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
highline (1.6.2)
json (2.2.0)
json_pure (1.6.1)
kramdown (1.8.0)
launchy (2.0.5)
addressable (~> 2.2.6)
liquid (2.2.2)
mime-types (1.16)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mini_portile2 (2.4.0)
mixlib-log (1.3.0)
mustache (0.99.4)
mustache (0.99.8)
net-ssh (2.1.4)
nokogiri (1.5.0)
posix-spawn (0.3.6)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
pygmentize (0.0.3)
rack (1.3.4)
rack-protection (1.1.4)
rack (1.6.11)
rack-protection (1.5.5)
rack
rake (0.9.2)
rdiscount (1.6.8)
rest-client (1.6.7)
mime-types (>= 1.16)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
tilt (~> 1.3, >= 1.3.3)
rouge (2.2.1)
sanitize (2.1.1)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.8.5)
thor (0.14.6)
tilt (1.3.3)
tilt (2.0.10)
twitter-text (1.14.7)
unf (~> 0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
useragent (0.14.0)

PLATFORMS
ruby
Expand All @@ -71,7 +97,7 @@ DEPENDENCIES
bundler (~> 1.0.12)
directory_watcher
engineyard
gollum (= 1.3.0)
gollum (= 4.0.1)
gollum-site
pygmentize
rake
Expand Down