Merge branch 'master' into 'zj-format-chat-messages'
# Conflicts: # spec/lib/gitlab/chat_commands/command_spec.rb
Showing
... | ... | @@ -322,7 +322,7 @@ group :test do |
gem 'email_spec', '~> 1.6.0' | ||
gem 'json-schema', '~> 2.6.2' | ||
gem 'webmock', '~> 1.21.0' | ||
gem 'test_after_commit', '~> 0.4.2' | ||
gem 'test_after_commit', '~> 1.1' | ||
gem 'sham_rack', '~> 1.3.6' | ||
gem 'timecop', '~> 0.8.0' | ||
end | ||
... | ... |
Please register or sign in to comment