diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-26 09:32:07 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-26 09:32:07 -0500 |
| commit | 08ec838ed501473846806be2680e8888ff859e10 (patch) | |
| tree | 4a4664c505d667db907084bd8850cd689f338f7e /Gemfile.lock | |
| parent | b2dcfc4db3828888f9aa0a9cc38e89fe84d30b2c (diff) | |
| parent | f150b8a5b9a6f56151523061813bad2cf48c9d91 (diff) | |
| download | gitlab-ce-08ec838ed501473846806be2680e8888ff859e10.tar.gz | |
Merge branch 'master' into avatar-croppingavatar-cropping
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bd220146bf7..d0f780e9519 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -962,8 +962,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) |