diff options
| author | connorshea <connor.james.shea@gmail.com> | 2016-03-25 15:48:13 -0600 |
|---|---|---|
| committer | connorshea <connor.james.shea@gmail.com> | 2016-03-25 15:48:13 -0600 |
| commit | e664d95437d4fa9d5fbde929799fcc38eae7800d (patch) | |
| tree | 38aa84a59ec5316ccf3fc51d06196140e7f8f23b | |
| parent | 28c94ee955888c48547c02f5d60698faa7aa7b58 (diff) | |
| download | gitlab-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).
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 7 insertions, 4 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 16c09ab6e6d..a1f663e976e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -806,8 +806,8 @@ GEM systemu (2.6.5) task_list (1.0.2) html-pipeline - teaspoon (1.0.2) - railties (>= 3.2.5, < 5) + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) temple (0.7.6) @@ -1048,7 +1048,7 @@ DEPENDENCIES sprockets (~> 3.3.5) state_machines-activerecord (~> 0.3.0) task_list (~> 1.0.2) - teaspoon (~> 1.0.0) + teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) thin (~> 1.6.1) @@ -1064,3 +1064,6 @@ DEPENDENCIES web-console (~> 2.0) webmock (~> 1.21.0) wikicloth (= 0.8.1) + +BUNDLED WITH + 1.11.2 |