diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-29 16:14:59 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-29 16:14:59 +0200 |
| commit | b231742687cf08d8663ce34a11f1b64f1fbe4a6a (patch) | |
| tree | e7cbf5b49f65b2e53e5b7e38fbb1aee2f8f80b52 /Gemfile | |
| parent | aabe93ce9c2c4947595f6d29628d5e1030bfb372 (diff) | |
| parent | 54957d6932c2b159e01b60ee1d4e191cfdf5b713 (diff) | |
| download | gitlab-ce-b231742687cf08d8663ce34a11f1b64f1fbe4a6a.tar.gz | |
Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296add-ability-to-archive-a-project-via-api-14296
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -234,7 +234,7 @@ end group :development do gem "foreman" - gem 'brakeman', '~> 3.1.0', require: false + gem 'brakeman', '~> 3.2.0', require: false gem "annotate", "~> 2.6.0" gem "letter_opener", '~> 1.1.2' @@ -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' |