Merge branch 'sh-fix-gemfile-order' into 'master'

Fix ordering of Gemfiles See merge request !2907

Merge branch 'sh-fix-gemfile-order' into 'master'
Fix ordering of Gemfiles See merge request !2907
84661628 · Robert Speicher · 36f02298 · ecf80364 · 84661628
Commit 84661628 authored Sep 13, 2017 by Robert Speicher
Hide 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
@@ -1073,8 +1073,8 @@ DEPENDENCIES
  grape (~> 1.0)
  grape-entity (~> 0.6.0)
  grape-route-helpers (~> 2.1.0)
-  gssapi
  grape_logging (~> 1.6)
+  gssapi
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes