diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-27 20:38:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-27 20:38:26 +0000 |
| commit | f7a9fc9cf81e8d58abb6e5b4c607626d0026c763 (patch) | |
| tree | 312f9a61df49f97048ca7f28a657a459181ff868 | |
| parent | 8edb316392dc60c6baa3a4d9f4051828932468a1 (diff) | |
| parent | e664d95437d4fa9d5fbde929799fcc38eae7800d (diff) | |
| download | gitlab-ce-f7a9fc9cf81e8d58abb6e5b4c607626d0026c763.tar.gz | |
Merge branch 'upgrade-teaspoon' into 'master'
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).
Working towards #14286.
See merge request !3409
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 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 4f9c404dc6d..a63cf318f84 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) |