diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-25 16:10:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-26 16:59:38 +0100 |
| commit | dd11449183ff380088c0aa4264c6d65aebd680e4 (patch) | |
| tree | 5e28ff4828f3a98b31bfe072890e1c6c9cd6bd70 | |
| parent | 70090bd8a6b09a73a56aefc4168aa1093bbefa3a (diff) | |
| download | gitlab-ce-dd11449183ff380088c0aa4264c6d65aebd680e4.tar.gz | |
Merge branch 'fix-gemfile-lock' into 'master'
Fix order in Gemfile.lock
See merge request !2969
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 978c2659d99..fe88dd5d98b 100644 --- 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) |