Skip to content
Snippets Groups Projects
Commit 8b761574 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

fix gollum

parent 34136d38
No related branches found
No related tags found
11 merge requests!104685 0 stable,!52746 1 stable,!3933Merge 5.0.1 into 5.1,!3723Patch 1,!3653Corrected command to create the git user #3650,!3635Swapped gem db configs,!3605Patch 1,!3580Implemented code search feature,!3565Added missing chr.,!3529Updating installation guide for 5.0,!3524Patch 1
This commit is part of merge request !10468. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Gemfile
+ 1
− 1
Edit View file @ 8b761574
@@ -23,7 +23,7 @@ gem 'omniauth-github'
 
# Extracting information from a git repository
# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c40a32432616a07fa7fc3c32c24ab73ad6a9718f'
gem 'grit_ext', '~> 0.6.2'
 
# Ruby/Rack Git Smart-HTTP Server Handler
Gemfile.lock
+ 2
− 2
Edit View file @ 8b761574
@@ -25,8 +25,8 @@ GIT
 
GIT
remote: https://github.com/gitlabhq/grit.git
revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
revision: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
ref: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment