diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-12 13:13:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-12 13:13:18 +0000 |
| commit | 0d866d89ec26bf05f2777ac5e5cb3f23f90f0a8c (patch) | |
| tree | e63b7f04193ab5cba04e08357d1520e3036d48f0 | |
| parent | b1dda8145433f15fcea683451c9c79927b19352e (diff) | |
| parent | c880d877b8982132448999f13e3cf4258dcb906f (diff) | |
| download | gitlab-ce-0d866d89ec26bf05f2777ac5e5cb3f23f90f0a8c.tar.gz | |
Merge branch 'rs-loosen-nokogiri' into 'master'
Loosen Nokogiri version requirement
Closes #13218
See merge request !2791
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -105,7 +105,7 @@ gem 'rouge', '~> 1.10.1' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM -gem 'nokogiri', '1.6.7.2' +gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs gem 'diffy', '~> 3.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index df5099c7581..98a36724fe0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -959,7 +959,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) - nokogiri (= 1.6.7.2) + nokogiri (~> 1.6.7, >= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) octokit (~> 3.8.0) |