diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-30 09:39:56 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-30 09:39:56 +0000 |
| commit | a7cbd3ad4245642c1aa4ae07e0b23aa39f59a8b8 (patch) | |
| tree | 39ec7dae4dd50c36e33e481541c7d3c46991a43b | |
| parent | 4dcfbe5f5d1cce0e5cbd943e69f46d39a591ba3d (diff) | |
| parent | e5aa9d6949d793c8b40bc60268b10cec1486c7a8 (diff) | |
| download | gitlab-ci-a7cbd3ad4245642c1aa4ae07e0b23aa39f59a8b8.tar.gz | |
Merge branch 'update_nokogiri' into 'master'
Update nokogiri version to remove warnings about libxml version mismatch.
GitLab [is using this version of nokogiri](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/Gemfile.lock#L378-379) too. The difference between current version and latest version is in multiple security and bug fixes as well as some features, see [their changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc).
Reason why I've created this MR is that upgrading to 1.6.6.2 removes warnings about libxml version mismatch when running ci rake tasks in omnibus as shown here: gitlab-org/omnibus-gitlab#636 .
See merge request !179
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cea1825..51f520f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,7 +252,7 @@ GEM method_source (0.8.2) mime-types (2.4.3) mimemagic (0.3.0) - mini_portile (0.5.2) + mini_portile (0.6.2) minitest (5.5.1) multi_json (1.11.0) multi_xml (0.5.5) @@ -262,8 +262,8 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - nokogiri (1.6.0) - mini_portile (~> 0.5.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) nprogress-rails (0.1.2.3) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) |