Merge branch 'fix-gemfile-lock' into 'master'

Fix order in Gemfile.lock See merge request !2969
gitlabhq · Feb 26, 2016 · dd11449 · dd11449
1 parent 70090bd
commit dd11449
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -960,8 +960,8 @@ DEPENDENCIES
   mysql2 (~> 0.3.16)
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
-  nokogiri (~> 1.6.7, >= 1.6.7.2)
   newrelic_rpm (~> 3.14)
+  nokogiri (~> 1.6.7, >= 1.6.7.2)
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)