Commit 835bacc2 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-update-gemfile-lock-2' into 'master'

Rails5 update Gemfile.rails5.lock

See merge request gitlab-org/gitlab-ce!20858
parents 13ea4b38 43914593
...@@ -364,7 +364,7 @@ GEM ...@@ -364,7 +364,7 @@ GEM
grape-entity (0.7.1) grape-entity (0.7.1)
activesupport (>= 4.0) activesupport (>= 4.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.0.5) grape-path-helpers (1.0.6)
activesupport (>= 4, < 5.1) activesupport (>= 4, < 5.1)
grape (~> 1.0) grape (~> 1.0)
rake (~> 12) rake (~> 12)
...@@ -378,7 +378,8 @@ GEM ...@@ -378,7 +378,8 @@ GEM
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0) googleapis-common-protos-types (~> 1.0.0)
googleauth (>= 0.5.1, < 0.7) googleauth (>= 0.5.1, < 0.7)
haml (4.0.7) haml (5.0.4)
temple (>= 0.8.0)
tilt tilt
haml_lint (0.26.0) haml_lint (0.26.0)
haml (>= 4.0, < 5.1) haml (>= 4.0, < 5.1)
...@@ -400,7 +401,7 @@ GEM ...@@ -400,7 +401,7 @@ GEM
hipchat (1.5.2) hipchat (1.5.2)
httparty httparty
mimemagic mimemagic
html-pipeline (2.8.3) html-pipeline (2.8.4)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
html2text (0.2.0) html2text (0.2.0)
...@@ -518,7 +519,7 @@ GEM ...@@ -518,7 +519,7 @@ GEM
net-ssh (5.0.1) net-ssh (5.0.1)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.3.1) nio4r (2.3.1)
nokogiri (1.8.3) nokogiri (1.8.4)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
...@@ -821,7 +822,7 @@ GEM ...@@ -821,7 +822,7 @@ GEM
et-orbi (~> 1.0) et-orbi (~> 1.0)
rugged (0.27.2) rugged (0.27.2)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize (4.6.5) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (~> 1.4) nokogumbo (~> 1.4)
...@@ -915,7 +916,7 @@ GEM ...@@ -915,7 +916,7 @@ GEM
rack (>= 1, < 3) rack (>= 1, < 3)
thor (0.19.4) thor (0.19.4)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.6) tilt (2.0.8)
timecop (0.8.1) timecop (0.8.1)
timfel-krb5-auth (0.8.3) timfel-krb5-auth (0.8.3)
toml (0.1.2) toml (0.1.2)
......
---
title: Rails5 update Gemfile.rails5.lock
merge_request: 20858
author: Jasper Maes
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment