diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
| commit | 6384aedace16fff336ff2a29d526ad8fcdfc2b84 (patch) | |
| tree | f8699aff6fb0d4e1a646d76ff2720520cd7c0652 /Gemfile | |
| parent | b3d8b85f6520c8f89690a8f0e3ab96f5e6740cb2 (diff) | |
| parent | 5d6fb753ef3288c3da7e63470b7acd3694d86137 (diff) | |
| download | gitlab-ce-6384aedace16fff336ff2a29d526ad8fcdfc2b84.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/admin/application_settings/_signin.html.haml
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -82,16 +82,9 @@ gem 'net-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order -# Before updating this gem, check if -# https://github.com/gollum/gollum-lib/pull/292 has been merged. -# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer -# in config/initializers/gollum.rb -gem 'gollum-lib', '~> 4.2', require: false - -# Before updating this gem, check if -# https://github.com/gollum/rugged_adapter/pull/28 has been merged. -# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb -gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +gem 'gitlab-gollum-lib', '~> 4.2' + +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' |