Merge branch 'gitlab-license-gemlock-fix' into 'master'

Bump missing gitlab-license version See merge request !556

Merge branch 'gitlab-license-gemlock-fix' into 'master'
Bump missing gitlab-license version See merge request !556
58af4fc0 · Stan Hu · 74cc4f94 · 4e984960 · 58af4fc0
Commit 58af4fc0 authored Jul 13, 2016 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -891,7 +891,7 @@ DEPENDENCIES
  github-markup (~> 1.3.1)
  gitlab-elasticsearch-git (~> 0.0.15)
  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-license (~> 0.0.4)
+  gitlab-license (~> 1.0)
  gitlab_git (~> 10.2)
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)