diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-13 18:38:59 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-13 18:38:59 +0300 |
| commit | f07316f27cc1a5d354bc82b4caa1de703a3bcb5e (patch) | |
| tree | 68c8f99f8df9375c9644993cf0bbd2f92cf9bfdd /Gemfile | |
| parent | 6f6d2d0ad5039fa8ace7e09c4f5867bb680b0f79 (diff) | |
| parent | 3463ffde9e3ef425fbaa6093f01212cccb01707b (diff) | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -285,9 +285,9 @@ group :development, :test do gem 'teaspoon', '~> 1.1.0' gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.6.4' + gem 'spring', '~> 1.7.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.0.0' + gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'rubocop', '~> 0.38.0', require: false |