Commit c4b812e5 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'pravi/gitlab-update-timecop' into 'master'

Update timecop 0.8.0 -> 0.9.1

See merge request gitlab-org/gitlab!26266
parents e19bfe2e 34cc51c5
...@@ -383,7 +383,7 @@ group :development, :test do ...@@ -383,7 +383,7 @@ group :development, :test do
gem 'simple_po_parser', '~> 1.1.2', require: false gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0' gem 'timecop', '~> 0.9.1'
gem 'png_quantizator', '~> 0.2.1', require: false gem 'png_quantizator', '~> 0.2.1', require: false
......
...@@ -1065,7 +1065,7 @@ GEM ...@@ -1065,7 +1065,7 @@ GEM
thread_safe (0.3.6) thread_safe (0.3.6)
thrift (0.11.0.0) thrift (0.11.0.0)
tilt (2.0.10) tilt (2.0.10)
timecop (0.8.1) timecop (0.9.1)
timfel-krb5-auth (0.8.3) timfel-krb5-auth (0.8.3)
toml (0.2.0) toml (0.2.0)
parslet (~> 1.8.0) parslet (~> 1.8.0)
...@@ -1387,7 +1387,7 @@ DEPENDENCIES ...@@ -1387,7 +1387,7 @@ DEPENDENCIES
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
test-prof (~> 0.10.0) test-prof (~> 0.10.0)
thin (~> 1.7.0) thin (~> 1.7.0)
timecop (~> 0.8.0) timecop (~> 0.9.1)
toml-rb (~> 1.0.0) toml-rb (~> 1.0.0)
truncato (~> 0.7.11) truncato (~> 0.7.11)
u2f (~> 0.2.1) u2f (~> 0.2.1)
......
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