diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-25 16:10:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-25 16:10:48 +0000 |
| commit | 8d3e5cf0db1aa811f2f9263092b8d7740acec5a6 (patch) | |
| tree | 354f8d1909e270e37fdc3a62ea708036677d0345 | |
| parent | 3973ce0fb4712414d9fd4b3f32feac0f5d9b5af9 (diff) | |
| parent | 77603c3ec2de15bf939cddddc93faea4d89b5b37 (diff) | |
| download | gitlab-ce-8d3e5cf0db1aa811f2f9263092b8d7740acec5a6.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 7a1b94cff6c..c48c733f5a1 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) |