summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-03-25 15:48:13 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-03-25 15:48:13 -0600
commite664d95437d4fa9d5fbde929799fcc38eae7800d (patch)
tree38aa84a59ec5316ccf3fc51d06196140e7f8f23b /Gemfile
parent28c94ee955888c48547c02f5d60698faa7aa7b58 (diff)
downloadgitlab-ce-e664d95437d4fa9d5fbde929799fcc38eae7800d.tar.gz
Upgrade Teaspoon from 1.0.1 to 1.1.5.
Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index cebd76e7370..fecb2a25093 100644
--- a/Gemfile
+++ b/Gemfile
@@ -279,7 +279,7 @@ group :development, :test do
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0'
- gem 'teaspoon', '~> 1.0.0'
+ gem 'teaspoon', '~> 1.1.0'
gem 'teaspoon-jasmine', '~> 2.2.0'
gem 'spring', '~> 1.6.4'