Merge branch 'master' into extend_markdown_upload
# Conflicts: # app/controllers/files_controller.rb
Showing
... | ... | @@ -41,7 +41,7 @@ gem "browser" |
gem "gitlab_git", '7.0.0.rc14' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' | ||
# LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" | ||
... | ... | @@ -50,7 +50,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" |
gem 'gollum-lib', '~> 4.0.0' | ||
# Language detection | ||
gem "gitlab-linguist", "~> 3.0.0", require: "linguist" | ||
gem "gitlab-linguist", "~> 3.0.1", require: "linguist" | ||
# API | ||
gem "grape", "~> 0.6.1" | ||
... | ... |
809 Bytes
495 Bytes
2.55 KB


