diff --git a/Gemfile b/Gemfile index e9c62e5c5b4..c38cede758d 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 1.3.0' +gem 'gitlab_git', '~> 1.4.1' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 1.0.1', require: 'grack' @@ -35,7 +35,7 @@ gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' # Git Wiki -gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib' +gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib' # Language detection gem "github-linguist", require: "linguist" diff --git a/Gemfile.lock b/Gemfile.lock index 2ced4eef514..369be882e14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,17 +147,17 @@ GEM pygments.rb (>= 0.2.13) github-markdown (0.5.3) github-markup (0.7.5) - gitlab-gollum-lib (1.0.0) + gitlab-gollum-lib (1.0.1) github-markdown (~> 0.5.3) github-markup (>= 0.7.5, < 1.0.0) - gitlab-grit (~> 2.5.1) + gitlab-grit (>= 2.5.1) nokogiri (~> 1.5.9) pygments.rb (~> 0.4.2) sanitize (~> 2.0.3) stringex (~> 1.5.1) gitlab-grack (1.0.1) rack (~> 1.4.1) - gitlab-grit (2.5.1) + gitlab-grit (2.6.0) charlock_holmes (~> 0.6.9) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -165,10 +165,10 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.3.0) + gitlab_git (1.4.1) activesupport (~> 3.2.13) github-linguist (~> 2.3.4) - gitlab-grit (~> 2.5.1) + gitlab-grit (~> 2.6.0) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -543,10 +543,10 @@ DEPENDENCIES gemoji (~> 1.2.1) github-linguist github-markup (~> 0.7.4) - gitlab-gollum-lib (~> 1.0.0) + gitlab-gollum-lib (~> 1.0.1) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.3.0) + gitlab_git (~> 1.4.1) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon