Merge branch 'master' into 'bootstrap4'
# Conflicts: # app/views/admin/application_settings/_signin.html.haml
Showing
... | ... | @@ -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' | ||
... | ... |
1018 Bytes
494 Bytes
5.22 KB
... | ... | @@ -16,7 +16,7 @@ |
"webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" | ||
}, | ||
"dependencies": { | ||
"@gitlab-org/gitlab-svgs": "^1.17.0", | ||
"@gitlab-org/gitlab-svgs": "^1.18.0", | ||
"autosize": "^4.0.0", | ||
"axios": "^0.17.1", | ||
"babel-core": "^6.26.0", | ||
... | ... |