Merge branch 'update_grack' into 'master'

Update gitlab-grack to 2.0.2. Updating to grack version 2.0.2 to fix an issue with smart http clients. See merge request !559

Merge branch 'update_grack' into 'master'
1cf07f6b · Dmitriy Zaporozhets · 8d9c7305 · 9ba85ffe · 1cf07f6b · 1cf07f6b
Commit 1cf07f6b authored Apr 22, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Gemfile Gemfile +2 -2

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "browser"
 gem "gitlab_git", '~> 7.1.10'

 # Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 2.0.1', require: 'grack'
+gem 'gitlab-grack', '~> 2.0.2', require: 'grack'

 # LDAP Auth
 gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
@@ -256,7 +256,7 @@ group :development, :test do
  gem "spring", '~> 1.3.1'
  gem "spring-commands-rspec", '1.0.4'
  gem "spring-commands-spinach", '1.0.0'
-  
+
  gem "byebug"
 end


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
    gitlab-flowdock-git-hook (0.4.2.2)
      gitlab-grit (>= 2.4.1)
      multi_json
-    gitlab-grack (2.0.1)
+    gitlab-grack (2.0.2)
      rack (~> 1.5.1)
    gitlab-grit (2.7.2)
      charlock_holmes (~> 0.6)
@@ -696,7 +696,7 @@ DEPENDENCIES
  gemnasium-gitlab-service (~> 0.2)
  github-markup
  gitlab-flowdock-git-hook (~> 0.4.2)
-  gitlab-grack (~> 2.0.1)
+  gitlab-grack (~> 2.0.2)
  gitlab-linguist (~> 3.0.1)
  gitlab_emoji (~> 0.1)
  gitlab_git (~> 7.1.10)